You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nutch.apache.org by ab...@apache.org on 2008/01/15 23:38:50 UTC

svn commit: r612264 - in /lucene/nutch/trunk: CHANGES.txt src/java/org/apache/nutch/fetcher/Fetcher2.java

Author: ab
Date: Tue Jan 15 14:38:47 2008
New Revision: 612264

URL: http://svn.apache.org/viewvc?rev=612264&view=rev
Log:
NUTCH-597 - NPE in Fetcher2 when redirecting.

Modified:
    lucene/nutch/trunk/CHANGES.txt
    lucene/nutch/trunk/src/java/org/apache/nutch/fetcher/Fetcher2.java

Modified: lucene/nutch/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/nutch/trunk/CHANGES.txt?rev=612264&r1=612263&r2=612264&view=diff
==============================================================================
--- lucene/nutch/trunk/CHANGES.txt (original)
+++ lucene/nutch/trunk/CHANGES.txt Tue Jan 15 14:38:47 2008
@@ -187,6 +187,8 @@
 64. NUTCH-528 - CrawlDbReader: add some new stats + dump into a CSV format
     (Emmanuel Joke via ab)
 
+65. NUTCH-597 - NPE in Fetcher2 (Remco Verhoef via ab)
+
 
 Release 0.9 - 2007-04-02
 

Modified: lucene/nutch/trunk/src/java/org/apache/nutch/fetcher/Fetcher2.java
URL: http://svn.apache.org/viewvc/lucene/nutch/trunk/src/java/org/apache/nutch/fetcher/Fetcher2.java?rev=612264&r1=612263&r2=612264&view=diff
==============================================================================
--- lucene/nutch/trunk/src/java/org/apache/nutch/fetcher/Fetcher2.java (original)
+++ lucene/nutch/trunk/src/java/org/apache/nutch/fetcher/Fetcher2.java Tue Jan 15 14:38:47 2008
@@ -553,9 +553,14 @@
                     newDatum.getMetaData().put(Nutch.WRITABLE_REPR_URL_KEY,
                         new Text(reprUrl));
                     fit = FetchItem.create(redirUrl, newDatum, byIP);
-                    FetchItemQueue fiq =
-                      fetchQueues.getFetchItemQueue(fit.queueID);
-                    fiq.addInProgressFetchItem(fit);
+                    if (fit != null) {
+                      FetchItemQueue fiq =
+                        fetchQueues.getFetchItemQueue(fit.queueID);
+                      fiq.addInProgressFetchItem(fit);
+                    } else {
+                      // stop redirecting
+                      redirecting = false;
+                    }
                   }
                 }
                 break;
@@ -581,9 +586,14 @@
                 newDatum.getMetaData().put(Nutch.WRITABLE_REPR_URL_KEY,
                     new Text(reprUrl));
                 fit = FetchItem.create(redirUrl, newDatum, byIP);
-                FetchItemQueue fiq =
-                  fetchQueues.getFetchItemQueue(fit.queueID);
-                fiq.addInProgressFetchItem(fit);
+                if (fit != null) {
+                  FetchItemQueue fiq =
+                    fetchQueues.getFetchItemQueue(fit.queueID);
+                  fiq.addInProgressFetchItem(fit);
+                } else {
+                  // stop redirecting
+                  redirecting = false;
+                }
                 break;
 
               case ProtocolStatus.EXCEPTION: