Author: kwright
Date: Mon Apr 14 22:34:33 2014
New Revision: 1587347
URL: http://svn.apache.org/r1587347
Log:
Fix for CONNECTORS-923.
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/RSSConnector.java
manifoldcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/ThrottleDescription.java
Modified: manifoldcf/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1587347&r1=1587346&r2=1587347&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Mon Apr 14 22:34:33 2014
@@ -3,6 +3,9 @@ $Id$
======================= 1.6-dev =====================
+CONNECTORS-923: Fix bandwidth throttling.
+(Karl Wright)
+
CONNECTORS-920: Be more explicit in Solr connector about handling
SocketTimeoutException.
(Hitoshi Tatsumi, Karl Wright)
Modified:
manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/RSSConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/RSSConnector.java?rev=1587347&r1=1587346&r2=1587347&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/RSSConnector.java
(original)
+++
manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/RSSConnector.java
Mon Apr 14 22:34:33 2014
@@ -193,7 +193,7 @@ public class RSSConnector extends org.ap
{
int maxKBytesPerSecondPerServer = Integer.parseInt(x);
if (maxKBytesPerSecondPerServer > 0)
- minimumMillisecondsPerBytePerServer =
1000.0/(double)maxKBytesPerSecondPerServer;
+ minimumMillisecondsPerBytePerServer =
1.0/(double)maxKBytesPerSecondPerServer;
}
catch (NumberFormatException e)
{
Modified:
manifoldcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/ThrottleDescription.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/ThrottleDescription.java?rev=1587347&r1=1587346&r2=1587347&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/ThrottleDescription.java
(original)
+++
manifoldcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/ThrottleDescription.java
Mon Apr 14 22:34:33 2014
@@ -91,7 +91,7 @@ public class ThrottleDescription impleme
{
double kbPerSecond = new Double(value).doubleValue();
if (kbPerSecond > 0)
- minMillisecondsPerByte = new
Double(1000.0/(double)kbPerSecond);
+ minMillisecondsPerByte = new Double(1.0/(double)kbPerSecond);
}
catch (NumberFormatException e)
{
