You are viewing a plain text version of this content. The canonical link for it is here.
Posted to droids-commits@incubator.apache.org by th...@apache.org on 2013/01/31 12:09:06 UTC

svn commit: r1440924 - in /incubator/droids/branches/0.2.x-cleanup: droids-core/src/main/java/org/apache/droids/core/Worker.java droids-crawler/src/main/java/org/apache/droids/crawler/CrawlingWorker.java

Author: thorsten
Date: Thu Jan 31 12:09:06 2013
New Revision: 1440924

URL: http://svn.apache.org/viewvc?rev=1440924&view=rev
Log:
Reducing exceptions expected by worker. Only allowing droidsExceptions.

Modified:
    incubator/droids/branches/0.2.x-cleanup/droids-core/src/main/java/org/apache/droids/core/Worker.java
    incubator/droids/branches/0.2.x-cleanup/droids-crawler/src/main/java/org/apache/droids/crawler/CrawlingWorker.java

Modified: incubator/droids/branches/0.2.x-cleanup/droids-core/src/main/java/org/apache/droids/core/Worker.java
URL: http://svn.apache.org/viewvc/incubator/droids/branches/0.2.x-cleanup/droids-core/src/main/java/org/apache/droids/core/Worker.java?rev=1440924&r1=1440923&r2=1440924&view=diff
==============================================================================
--- incubator/droids/branches/0.2.x-cleanup/droids-core/src/main/java/org/apache/droids/core/Worker.java (original)
+++ incubator/droids/branches/0.2.x-cleanup/droids-core/src/main/java/org/apache/droids/core/Worker.java Thu Jan 31 12:09:06 2013
@@ -35,6 +35,6 @@ public interface Worker<T extends Task> 
      * @throws DroidsException
      * @throws IOException
      */
-    public void execute(final T task) throws DroidsException, IOException;
+    public void execute(final T task) throws DroidsException;
 
 }

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=1440924&r1=1440923&r2=1440924&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 Thu Jan 31 12:09:06 2013
@@ -22,7 +22,6 @@ import org.apache.droids.core.Worker;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.IOException;
 import java.util.Set;
 
 public class CrawlingWorker implements Worker<LinkedTask> {
@@ -36,24 +35,27 @@ public class CrawlingWorker implements W
     }
 
     @Override
-    public void execute(LinkedTask task) throws DroidsException, IOException {
-        if (logger.isInfoEnabled()) {
-            logger.info("Loading " + task.getURI());
-        }
-        droid.load(task);
-        droid.parse(task);
-
-        // add this to a link handler
-        Set<LinkedTask> links = task.getContentEntity().getLinks();
-        if (links != null) {
-            for (LinkedTask outLink : links) {
-                if (droid.filter(outLink) != null) {
-                    droid.add(outLink);
+    public void execute(LinkedTask task) throws DroidsException {
+        try {
+            if (logger.isInfoEnabled()) {
+                logger.info("Loading " + task.getURI());
+            }
+            droid.load(task);
+            droid.parse(task);
+            // add this to a link handler
+            Set<LinkedTask> links = task.getContentEntity().getLinks();
+            if (links != null) {
+                for (LinkedTask outLink : links) {
+                    if (droid.filter(outLink) != null) {
+                        droid.add(outLink);
+                    }
                 }
             }
+            droid.handle(task);
+            droid.finish(task);
+        } catch (Exception e) {
+            throw new DroidsException(e);
         }
-        droid.handle(task);
-        droid.finish(task);
     }
 
 }