Author: kwright
Date: Fri Sep 28 12:00:37 2012
New Revision: 1391415
URL: http://svn.apache.org/viewvc?rev=1391415&view=rev
Log:
Pull up fix for CONNECTORS-547 from trunk.
Modified:
manifoldcf/branches/release-1.0-branch/ (props changed)
manifoldcf/branches/release-1.0-branch/CHANGES.txt
manifoldcf/branches/release-1.0-branch/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/ThrottledFetcher.java
Propchange: manifoldcf/branches/release-1.0-branch/
------------------------------------------------------------------------------
Merged /manifoldcf/trunk:r1391414
Modified: manifoldcf/branches/release-1.0-branch/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.0-branch/CHANGES.txt?rev=1391415&r1=1391414&r2=1391415&view=diff
==============================================================================
--- manifoldcf/branches/release-1.0-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-1.0-branch/CHANGES.txt Fri Sep 28 12:00:37 2012
@@ -3,6 +3,10 @@ $Id$
======================= 1.0 =====================
+CONNECTORS-547: Web crawler, on encountering fatal error with no
+contents, would throw a StringIndexOutOfRange exception.
+(Erlend Garåsen, Karl Wright)
+
CONNECTORS-545: web-proprietary wars need to be used by single-
process proprietary example.
(Shinichiro Abe, Karl Wright)
@@ -25,7 +29,7 @@ CONNECTORS-538: Maven build broken on Sh
CONNECTORS-537: NPE when trying to display a history report when
the corresponding connector is unregistered.
-(Erlend Garason, Karl Wright)
+(Erlend Garåsen, Karl Wright)
CONNECTORS-533: Do not forgo xxx-README files in connector-lib-proprietary.
(Karl Wright)
Modified:
manifoldcf/branches/release-1.0-branch/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/ThrottledFetcher.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.0-branch/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/ThrottledFetcher.java?rev=1391415&r1=1391414&r2=1391415&view=diff
==============================================================================
---
manifoldcf/branches/release-1.0-branch/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/ThrottledFetcher.java
(original)
+++
manifoldcf/branches/release-1.0-branch/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/ThrottledFetcher.java
Fri Sep 28 12:00:37 2012
@@ -1773,6 +1773,8 @@ public class ThrottledFetcher
Reader r = new InputStreamReader(is,encoding);
char[] buffer = new char[maxSize];
int amt = r.read(buffer);
+ if (amt == -1)
+ return "";
return new String(buffer,0,amt);
}
finally
