svn commit: r1587923 - in /nutch/trunk: CHANGES.txt src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api/HttpBase.java

[jnioche]

Author: jnioche
Date: Wed Apr 16 14:29:23 2014
New Revision: 1587923

URL: http://svn.apache.org/r1587923
Log:
NUTCH1720 Duplicate code in HttpBase

Modified:
    nutch/trunk/CHANGES.txt
    
nutch/trunk/src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api/HttpBase.java

Modified: nutch/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/nutch/trunk/CHANGES.txt?rev=1587923&r1=1587922&r2=1587923&view=diff
==============================================================================
--- nutch/trunk/CHANGES.txt (original)
+++ nutch/trunk/CHANGES.txt Wed Apr 16 14:29:23 2014
@@ -2,6 +2,8 @@ Nutch Change Log
 
 Nutch Current Development
 
+* NUTCH-1720 Duplicate lines in HttpBase.java (Walter Tietze via jnioche)
+
 * NUTCH-1750 Improvement of Fetcher's reportStatus (jnioche)
 
 * NUTCH-1747 Use AtomicInteger as semaphore in Fetcher (jnioche)

Modified: 
nutch/trunk/src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api/HttpBase.java
URL: 
http://svn.apache.org/viewvc/nutch/trunk/src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api/HttpBase.java?rev=1587923&r1=1587922&r2=1587923&view=diff
==============================================================================
--- 
nutch/trunk/src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api/HttpBase.java
 (original)
+++ 
nutch/trunk/src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api/HttpBase.java
 Wed Apr 16 14:29:23 2014
@@ -165,9 +165,6 @@ public abstract class HttpBase implement
       if (code == 200) { // got a good response
         return new ProtocolOutput(c); // return it
         
-      } else if (code == 410) { // page is gone
-        return new ProtocolOutput(c, new ProtocolStatus(ProtocolStatus.GONE, 
"Http: " + code + " url=" + url));
-        
       } else if (code >= 300 && code < 400) { // handle redirect
         String location = response.getHeader("Location");
         // some broken servers, such as MS IIS, use lowercase header name...
@@ -206,7 +203,7 @@ public abstract class HttpBase implement
       } else if (code == 404) {
         return new ProtocolOutput(c, new 
ProtocolStatus(ProtocolStatus.NOTFOUND, u));
       } else if (code == 410) { // permanently GONE
-        return new ProtocolOutput(c, new ProtocolStatus(ProtocolStatus.GONE, 
u));
+        return new ProtocolOutput(c, new ProtocolStatus(ProtocolStatus.GONE, 
"Http: " + code + " url=" + u));
       } else {
         return new ProtocolOutput(c, new 
ProtocolStatus(ProtocolStatus.EXCEPTION, "Http code=" + code + ", url="
                 + u));