svn commit: r1647550 - in /manifoldcf/branches/CONNECTORS-1119: connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/notifications/email/ framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/

[kwright]

Author: kwright
Date: Tue Dec 23 11:26:24 2014
New Revision: 1647550

URL: http://svn.apache.org/r1647550
Log:
Handle ManifoldCF exceptions on notifications

Modified:
    
manifoldcf/branches/CONNECTORS-1119/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/notifications/email/EmailConnector.java
    
manifoldcf/branches/CONNECTORS-1119/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobResetThread.java

Modified: 
manifoldcf/branches/CONNECTORS-1119/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/notifications/email/EmailConnector.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1119/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/notifications/email/EmailConnector.java?rev=1647550&r1=1647549&r2=1647550&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-1119/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/notifications/email/EmailConnector.java
 (original)
+++ 
manifoldcf/branches/CONNECTORS-1119/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/notifications/email/EmailConnector.java
 Tue Dec 23 11:26:24 2014
@@ -649,7 +649,7 @@ public class EmailConnector extends org.
     throws ManifoldCFException, ServiceInterruption
   {
     Logging.connectors.error("Email: Error "+context+": "+e.getMessage(),e);
-    throw new ServiceInterruption("Error "+context+": 
"+e.getMessage(),e,-1,-1,-1,true);
+    throw new ManifoldCFException("Error "+context+": "+e.getMessage(),e);
   }
   
   /** Class to set up connection.

Modified: 
manifoldcf/branches/CONNECTORS-1119/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobResetThread.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1119/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobResetThread.java?rev=1647550&r1=1647549&r2=1647550&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-1119/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobResetThread.java
 (original)
+++ 
manifoldcf/branches/CONNECTORS-1119/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobResetThread.java
 Tue Dec 23 11:26:24 2014
@@ -206,6 +206,12 @@ public class JobResetThread extends Thre
       {
         Logging.connectors.warn("Can't notify right now: "+e.getMessage(),e);
       }
+      catch (ManifoldCFException e)
+      {
+        if (e.getErrorCode() == ManifoldCFException.INTERRUPTED)
+          throw e;
+        Logging.connectors.warn("Error notifying: "+ e.getMessage(),e);
+      }
     }
   }