From aa9bee7b1b1739fc848f84e08980ff834c0cb5ba Mon Sep 17 00:00:00 2001 From: "yihua.huang" Date: Mon, 29 Jul 2013 20:05:44 +0800 Subject: [PATCH] add comments for selenium driver --- .../selenium/downloader/SeleniumDownloader.java | 1 - .../webmagic/selenium/downloader/WebDriverPool.java | 10 ++++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/webmagic-plugin/webmagic-selenium/src/main/java/us/codecraft/webmagic/selenium/downloader/SeleniumDownloader.java b/webmagic-plugin/webmagic-selenium/src/main/java/us/codecraft/webmagic/selenium/downloader/SeleniumDownloader.java index 76ac0508..1b689d4d 100644 --- a/webmagic-plugin/webmagic-selenium/src/main/java/us/codecraft/webmagic/selenium/downloader/SeleniumDownloader.java +++ b/webmagic-plugin/webmagic-selenium/src/main/java/us/codecraft/webmagic/selenium/downloader/SeleniumDownloader.java @@ -82,7 +82,6 @@ public class SeleniumDownloader implements Downloader, Destroyable { } WebElement webElement = webDriver.findElement(By.xpath("/html")); String content = webElement.getAttribute("outerHTML"); - // Page page = new Page(); page.setHtml(new Html(UrlUtils.fixAllRelativeHrefs(content, request.getUrl()))); page.setUrl(new PlainText(request.getUrl())); diff --git a/webmagic-plugin/webmagic-selenium/src/main/java/us/codecraft/webmagic/selenium/downloader/WebDriverPool.java b/webmagic-plugin/webmagic-selenium/src/main/java/us/codecraft/webmagic/selenium/downloader/WebDriverPool.java index 039cef98..faed8d63 100644 --- a/webmagic-plugin/webmagic-selenium/src/main/java/us/codecraft/webmagic/selenium/downloader/WebDriverPool.java +++ b/webmagic-plugin/webmagic-selenium/src/main/java/us/codecraft/webmagic/selenium/downloader/WebDriverPool.java @@ -27,8 +27,16 @@ class WebDriverPool { private AtomicInteger stat = new AtomicInteger(STAT_RUNNING); + /** + * store webDrivers created + */ private List webDriverList = Collections.synchronizedList(new ArrayList()); + /** + * store webDrivers available + */ + private BlockingDeque innerQueue = new LinkedBlockingDeque(); + public WebDriverPool(int capacity) { this.capacity = capacity; } @@ -37,8 +45,6 @@ class WebDriverPool { this(DEFAULT_CAPACITY); } - private BlockingDeque innerQueue = new LinkedBlockingDeque(); - public WebDriver get() throws InterruptedException { checkRunning(); WebDriver poll = innerQueue.poll();