Author: tobr
Date: Fri Feb 1 12:56:51 2013
New Revision: 1441433
URL: http://svn.apache.org/viewvc?rev=1441433&view=rev
Log:
fixed bug using unfiltered tasks
Modified:
incubator/droids/branches/0.2.x-cleanup/droids-crawler/src/main/java/org/apache/droids/crawler/CrawlingWorker.java
incubator/droids/branches/0.2.x-cleanup/droids-crawler/src/test/java/org/apache/droids/crawler/CrawlingDroidTest.java
incubator/droids/branches/0.2.x-cleanup/droids-crawler/src/test/resources/logback.xml
Modified:
incubator/droids/branches/0.2.x-cleanup/droids-crawler/src/main/java/org/apache/droids/crawler/CrawlingWorker.java
URL:
http://svn.apache.org/viewvc/incubator/droids/branches/0.2.x-cleanup/droids-crawler/src/main/java/org/apache/droids/crawler/CrawlingWorker.java?rev=1441433&r1=1441432&r2=1441433&view=diff
==============================================================================
---
incubator/droids/branches/0.2.x-cleanup/droids-crawler/src/main/java/org/apache/droids/crawler/CrawlingWorker.java
(original)
+++
incubator/droids/branches/0.2.x-cleanup/droids-crawler/src/main/java/org/apache/droids/crawler/CrawlingWorker.java
Fri Feb 1 12:56:51 2013
@@ -46,8 +46,12 @@ public class CrawlingWorker implements W
Set<LinkedTask> links = task.getContentEntity().getLinks();
if (links != null) {
for (LinkedTask outLink : links) {
- if (droid.filter(outLink) != null) {
- droid.add(outLink);
+ LinkedTask filteredTask = droid.filter(outLink);
+ if (filteredTask != null) {
+ if (logger.isDebugEnabled()) {
+ logger.debug("add task: " + filteredTask.getURI());
+ }
+ droid.add(filteredTask);
}
}
}
Modified:
incubator/droids/branches/0.2.x-cleanup/droids-crawler/src/test/java/org/apache/droids/crawler/CrawlingDroidTest.java
URL:
http://svn.apache.org/viewvc/incubator/droids/branches/0.2.x-cleanup/droids-crawler/src/test/java/org/apache/droids/crawler/CrawlingDroidTest.java?rev=1441433&r1=1441432&r2=1441433&view=diff
==============================================================================
---
incubator/droids/branches/0.2.x-cleanup/droids-crawler/src/test/java/org/apache/droids/crawler/CrawlingDroidTest.java
(original)
+++
incubator/droids/branches/0.2.x-cleanup/droids-crawler/src/test/java/org/apache/droids/crawler/CrawlingDroidTest.java
Fri Feb 1 12:56:51 2013
@@ -55,21 +55,19 @@ public class CrawlingDroidTest {
droid.setInitialLocations(initialLocations);
droid.addParsers(new SimpleLinkParser<LinkedTask>());
-
- // just output the filename
- droid.addHandlers(new ReportHandler());
+ ReportHandler reportHandler = new ReportHandler();
+ droid.addHandlers(reportHandler);
droid.start();
- assertFalse(ReportHandler.getReport().isEmpty());
- assertEquals(5, ReportHandler.getReport().size());
- assertTrue(ReportHandler.getReport().contains(baseURI +
"/start_html"));
- assertTrue(ReportHandler.getReport().contains(baseURI +
"/page1_html"));
- assertTrue(ReportHandler.getReport().contains(baseURI +
"/page2_html"));
- assertTrue(ReportHandler.getReport().contains(baseURI +
"/page3_html"));
- assertTrue(ReportHandler.getReport().contains(baseURI +
"/page4_html"));
+ assertFalse(reportHandler.getReport().isEmpty());
+ assertEquals(5, reportHandler.getReport().size());
+ assertTrue(reportHandler.getReport().contains(baseURI +
"/start_html"));
+ assertTrue(reportHandler.getReport().contains(baseURI +
"/page1_html"));
+ assertTrue(reportHandler.getReport().contains(baseURI +
"/page2_html"));
+ assertTrue(reportHandler.getReport().contains(baseURI +
"/page3_html"));
+ assertTrue(reportHandler.getReport().contains(baseURI +
"/page4_html"));
- ReportHandler.recycle();
}
}
\ No newline at end of file
Modified:
incubator/droids/branches/0.2.x-cleanup/droids-crawler/src/test/resources/logback.xml
URL:
http://svn.apache.org/viewvc/incubator/droids/branches/0.2.x-cleanup/droids-crawler/src/test/resources/logback.xml?rev=1441433&r1=1441432&r2=1441433&view=diff
==============================================================================
---
incubator/droids/branches/0.2.x-cleanup/droids-crawler/src/test/resources/logback.xml
(original)
+++
incubator/droids/branches/0.2.x-cleanup/droids-crawler/src/test/resources/logback.xml
Fri Feb 1 12:56:51 2013
@@ -9,7 +9,7 @@
</appender>
<logger name="org.apache.droids" level="info"/>
- <logger name="org.apache.http.wire" level="info"/>
+ <logger name="org.apache.http.wire" level="info"/>
<root level="info">
