svn commit: r1536979 - in /manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf: authorities/authority/AuthorityConnectionManager.java crawler/repository/RepositoryConnectionManager.java

[kwright]

Author: kwright
Date: Wed Oct 30 06:28:25 2013
New Revision: 1536979

URL: http://svn.apache.org/r1536979
Log:
Correct one flaw with my improved upgrade design

Modified:
    
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/authority/AuthorityConnectionManager.java
    
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/repository/RepositoryConnectionManager.java

Modified: 
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/authority/AuthorityConnectionManager.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/authority/AuthorityConnectionManager.java?rev=1536979&r1=1536978&r2=1536979&view=diff
==============================================================================
--- 
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/authority/AuthorityConnectionManager.java
 (original)
+++ 
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/authority/AuthorityConnectionManager.java
 Wed Oct 30 06:28:25 2013
@@ -152,7 +152,7 @@ public class AuthorityConnectionManager 
               }
               catch (ManifoldCFException e)
               {
-                if (e.getErrorCode() != 
ManifoldCFException.DATABASE_TRANSACTION_ABORT)
+                if (e.getErrorCode() == ManifoldCFException.INTERRUPTED)
                   throw e;
                 // Fall through; the row exists already
               }
@@ -292,7 +292,7 @@ public class AuthorityConnectionManager 
         }
         catch (ManifoldCFException e)
         {
-          if (e.getErrorCode() != 
ManifoldCFException.DATABASE_TRANSACTION_ABORT)
+          if (e.getErrorCode() == ManifoldCFException.INTERRUPTED)
             throw e;
           // Fall through; the row exists already
         }

Modified: 
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/repository/RepositoryConnectionManager.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/repository/RepositoryConnectionManager.java?rev=1536979&r1=1536978&r2=1536979&view=diff
==============================================================================
--- 
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/repository/RepositoryConnectionManager.java
 (original)
+++ 
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/repository/RepositoryConnectionManager.java
 Wed Oct 30 06:28:25 2013
@@ -150,7 +150,7 @@ public class RepositoryConnectionManager
               }
               catch (ManifoldCFException e)
               {
-                if (e.getErrorCode() != 
ManifoldCFException.DATABASE_TRANSACTION_ABORT)
+                if (e.getErrorCode() == ManifoldCFException.INTERRUPTED)
                   throw e;
                 // Fall through; the row exists already
               }