Browse Source

Merge branch 'master' into 10.3.x

Shinsuke Sugaya 8 năm trước cách đây
mục cha
commit
a94d15d0ca

+ 9 - 5
src/main/java/org/codelibs/fess/thumbnail/impl/WebDriverGenerator.java

@@ -94,7 +94,9 @@ public class WebDriverGenerator extends BaseThumbnailGenerator {
     @Override
     public void destroy() {
         if (webDriver != null) {
-            webDriver.quit();
+            synchronized (this) {
+                webDriver.quit();
+            }
         }
     }
 
@@ -121,10 +123,12 @@ public class WebDriverGenerator extends BaseThumbnailGenerator {
         }
 
         if (webDriver instanceof TakesScreenshot) {
-            webDriver.get(url);
-            final File thumbnail = ((TakesScreenshot) webDriver).getScreenshotAs(OutputType.FILE);
-            convert(thumbnail, outputFile);
-            return true;
+            synchronized (this) {
+                webDriver.get(url);
+                final File thumbnail = ((TakesScreenshot) webDriver).getScreenshotAs(OutputType.FILE);
+                convert(thumbnail, outputFile);
+                return true;
+            }
         } else {
             logger.warn("WebDriver is not instance of TakesScreenshot: " + webDriver);
             return false;