svn commit: r1658004 - in /manifoldcf/trunk: ./ framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/

[kwright]

Author: kwright
Date: Sat Feb  7 00:57:55 2015
New Revision: 1658004

URL: http://svn.apache.org/r1658004
Log:
Tentative fix for CONNECTORS-1156.

Modified:
    manifoldcf/trunk/CHANGES.txt
    
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobNotificationThread.java
    
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/SeedingThread.java
    
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StartDeleteThread.java

Modified: manifoldcf/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1658004&r1=1658003&r2=1658004&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Sat Feb  7 00:57:55 2015
@@ -3,6 +3,10 @@ $Id$
 
 ======================= 2.1-dev =====================
 
+CONNECTORS-1156: Difficulty shutting down agents process after
+a while executing.
+(Adrian Conlon, Karl Wright)
+
 CONNECTORS-1157: FileNet connector URI is incorrect for document
 subtypes.
 (Guy Sperry)

Modified: 
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobNotificationThread.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobNotificationThread.java?rev=1658004&r1=1658003&r2=1658004&view=diff
==============================================================================
--- 
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobNotificationThread.java
 (original)
+++ 
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobNotificationThread.java
 Sat Feb  7 00:57:55 2015
@@ -238,6 +238,8 @@ public class JobNotificationThread exten
                 }
                 catch (ManifoldCFException e)
                 {
+                  if (e.getErrorCode() == ManifoldCFException.INTERRUPTED)
+                    throw e;
                   exception = e;
                 }
               }
@@ -416,6 +418,8 @@ public class JobNotificationThread exten
                 }
                 catch (ManifoldCFException e)
                 {
+                  if (e.getErrorCode() == ManifoldCFException.INTERRUPTED)
+                    throw e;
                   exception = e;
                 }
               }

Modified: 
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/SeedingThread.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/SeedingThread.java?rev=1658004&r1=1658003&r2=1658004&view=diff
==============================================================================
--- 
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/SeedingThread.java
 (original)
+++ 
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/SeedingThread.java
 Sat Feb  7 00:57:55 2015
@@ -243,6 +243,8 @@ public class SeedingThread extends Threa
                 }
                 catch (ManifoldCFException e)
                 {
+                  if (e.getErrorCode() == ManifoldCFException.INTERRUPTED)
+                    throw e;
                   exception = e;
                 }
               }

Modified: 
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StartDeleteThread.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StartDeleteThread.java?rev=1658004&r1=1658003&r2=1658004&view=diff
==============================================================================
--- 
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StartDeleteThread.java
 (original)
+++ 
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StartDeleteThread.java
 Sat Feb  7 00:57:55 2015
@@ -142,6 +142,8 @@ public class StartDeleteThread extends T
                 }
                 catch (ManifoldCFException e)
                 {
+                  if (e.getErrorCode() == ManifoldCFException.INTERRUPTED)
+                    throw e;
                   exception = e;
                 }
               }