Merge pull request #796 from jensbac/master

[#795] Fixed lazy instantiation for some fields of `WebDriverManager`
bonigarcia · Mar 1, 2022 · 751b652 · 751b652
2 parents 47af553 + ce18bb1
commit 751b652
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## [5.1.1] - 2022-xx-xx
+
+### Fixed
+- detection for snap installed browser (issue #795)
+
 ## [5.1.0] - 2022-02-17
 ### Added
 - Add Docker Extra Hosts API method: dockerExtraHosts(String[]) (PR #788)

diff --git a/src/main/java/io/github/bonigarcia/wdm/WebDriverManager.java b/src/main/java/io/github/bonigarcia/wdm/WebDriverManager.java
@@ -1487,17 +1487,26 @@ protected HttpClient getHttpClient() {
 
     protected ResolutionCache getResolutionCache() {
         return Optional.ofNullable(resolutionCache)
-                .orElse(new ResolutionCache(config()));
+                .orElseGet(() -> {
+                    resolutionCache = new ResolutionCache(config());
+                    return resolutionCache;
+                });
     }
 
     protected VersionDetector getVersionDetector() {
         return Optional.ofNullable(versionDetector)
-                .orElse(new VersionDetector(config(), getHttpClient()));
+                .orElseGet(() -> {
+                    versionDetector = new VersionDetector(config(), getHttpClient());
+                    return versionDetector;
+                });
     }
 
     protected WebDriverCreator getWebDriverCreator() {
         return Optional.ofNullable(webDriverCreator)
-                .orElse(new WebDriverCreator(config()));
+                .orElseGet(() -> {
+                    webDriverCreator = new WebDriverCreator(config());
+                    return webDriverCreator;
+                });
     }
 
     protected FilenameFilter getFolderFilter() {