Author: kwright
Date: Tue Jun 18 16:19:51 2013
New Revision: 1494185
URL: http://svn.apache.org/r1494185
Log:
Fix for CONNECTORS-722.
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/connectors/dropbox/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/dropbox/DropboxRepositoryConnector.java
manifoldcf/trunk/connectors/googledrive/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/googledrive/GoogleDriveRepositoryConnector.java
Modified: manifoldcf/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1494185&r1=1494184&r2=1494185&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Tue Jun 18 16:19:51 2013
@@ -3,6 +3,10 @@ $Id$
======================= 1.3-dev =====================
+CONNECTORS-722: Fix hang during seeding in DropBox connector and
+GoogleDrive connector.
+(Andrew Janowczyk, Karl Wright)
+
CONNECTORS-721: Fix a refactoring error in DropBox connector.
(Andrew Janowczyk)
Modified:
manifoldcf/trunk/connectors/dropbox/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/dropbox/DropboxRepositoryConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/dropbox/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/dropbox/DropboxRepositoryConnector.java?rev=1494185&r1=1494184&r2=1494185&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/dropbox/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/dropbox/DropboxRepositoryConnector.java
(original)
+++
manifoldcf/trunk/connectors/dropbox/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/dropbox/DropboxRepositoryConnector.java
Tue Jun 18 16:19:51 2013
@@ -791,6 +791,7 @@ public class DropboxRepositoryConnector
public void run() {
try {
session.getSeeds(seedBuffer,path,25000); //upper limit on files to get
supported by dropbox api in a single directory
+ seedBuffer.signalDone();
} catch (Throwable e) {
this.exception = e;
}
Modified:
manifoldcf/trunk/connectors/googledrive/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/googledrive/GoogleDriveRepositoryConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/googledrive/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/googledrive/GoogleDriveRepositoryConnector.java?rev=1494185&r1=1494184&r2=1494185&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/googledrive/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/googledrive/GoogleDriveRepositoryConnector.java
(original)
+++
manifoldcf/trunk/connectors/googledrive/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/googledrive/GoogleDriveRepositoryConnector.java
Tue Jun 18 16:19:51 2013
@@ -845,6 +845,7 @@ public class GoogleDriveRepositoryConnec
public void run() {
try {
session.getSeeds(seedBuffer, googleDriveQuery);
+ seedBuffer.signalDone();
} catch (Throwable e) {
this.exception = e;
}
@@ -1240,6 +1241,7 @@ public class GoogleDriveRepositoryConnec
public void run() {
try {
session.getChildren(childBuffer, nodeId);
+ childBuffer.signalDone();
} catch (Throwable e) {
this.exception = e;
}