0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 10.3.x

Browse source
This commit is contained in:
Shinsuke Sugaya 2016-10-06 23:18:51 +09:00
commit a94d15d0ca
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/org/codelibs/fess/thumbnail/impl/WebDriverGenerator.java
View file

@ -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;