incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1133518 - in /incubator/lcf/trunk: ./ framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/ framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/interfaces/ framework/pull-agent/src/main/java/org/apache/ma...
Date Wed, 08 Jun 2011 19:31:43 GMT
Author: kwright
Date: Wed Jun  8 19:31:43 2011
New Revision: 1133518

URL: http://svn.apache.org/viewvc?rev=1133518&view=rev
Log:
Fix for CONNECTORS-110

Modified:
    incubator/lcf/trunk/CHANGES.txt
    incubator/lcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/OutputConnectorFactory.java
    incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/interfaces/AuthorityConnectorFactory.java
    incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/RepositoryConnectorFactory.java

Modified: incubator/lcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/CHANGES.txt?rev=1133518&r1=1133517&r2=1133518&view=diff
==============================================================================
--- incubator/lcf/trunk/CHANGES.txt (original)
+++ incubator/lcf/trunk/CHANGES.txt Wed Jun  8 19:31:43 2011
@@ -3,6 +3,10 @@ $Id$
 
 ======================= 0.3-dev =========================
 
+CONNECTORS-210: Handle RuntimeException exceptions better in
+connector factories.
+(Farzad Valad, Karl Wright)
+
 CONNECTORS-208: Make support for metadata Reader objects really
 work.
 (Karl Wright)

Modified: incubator/lcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/OutputConnectorFactory.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/OutputConnectorFactory.java?rev=1133518&r1=1133517&r2=1133518&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/OutputConnectorFactory.java
(original)
+++ incubator/lcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/OutputConnectorFactory.java
Wed Jun  8 19:31:43 2011
@@ -145,6 +145,8 @@ public class OutputConnectorFactory
       Throwable z = e.getTargetException();
       if (z instanceof Error)
         throw (Error)z;
+      else if (z instanceof RuntimeException)
+        throw (RuntimeException)z;
       else
         throw (ManifoldCFException)z;
     }
@@ -214,6 +216,8 @@ public class OutputConnectorFactory
       Throwable z = e.getTargetException();
       if (z instanceof Error)
         throw (Error)z;
+      else if (z instanceof RuntimeException)
+        throw (RuntimeException)z;
       else
         throw (ManifoldCFException)z;
     }
@@ -307,9 +311,9 @@ public class OutputConnectorFactory
           }
         }
         if (e instanceof ManifoldCFException)
-        {
           throw (ManifoldCFException)e;
-        }
+        else if (e instanceof RuntimeException)
+          throw (RuntimeException)e;
         throw (Error)e;
       }
       i++;
@@ -567,6 +571,8 @@ public class OutputConnectorFactory
           Throwable z = e.getTargetException();
           if (z instanceof Error)
             throw (Error)z;
+          else if (z instanceof RuntimeException)
+            throw (RuntimeException)z;
           else
             throw (ManifoldCFException)z;
         }

Modified: incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/interfaces/AuthorityConnectorFactory.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/interfaces/AuthorityConnectorFactory.java?rev=1133518&r1=1133517&r2=1133518&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/interfaces/AuthorityConnectorFactory.java
(original)
+++ incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/interfaces/AuthorityConnectorFactory.java
Wed Jun  8 19:31:43 2011
@@ -136,6 +136,8 @@ public class AuthorityConnectorFactory
       Throwable z = e.getTargetException();
       if (z instanceof Error)
         throw (Error)z;
+      else if (z instanceof RuntimeException)
+        throw (RuntimeException)z;
       else
         throw (ManifoldCFException)z;
     }
@@ -205,6 +207,8 @@ public class AuthorityConnectorFactory
       Throwable z = e.getTargetException();
       if (z instanceof Error)
         throw (Error)z;
+      else if (z instanceof RuntimeException)
+        throw (RuntimeException)z;
       else
         throw (ManifoldCFException)z;
     }
@@ -467,6 +471,8 @@ public class AuthorityConnectorFactory
           Throwable z = e.getTargetException();
           if (z instanceof Error)
             throw (Error)z;
+          else if (z instanceof RuntimeException)
+            throw (RuntimeException)z;
           else
             throw (ManifoldCFException)z;
         }

Modified: incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/RepositoryConnectorFactory.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/RepositoryConnectorFactory.java?rev=1133518&r1=1133517&r2=1133518&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/RepositoryConnectorFactory.java
(original)
+++ incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/RepositoryConnectorFactory.java
Wed Jun  8 19:31:43 2011
@@ -175,6 +175,8 @@ public class RepositoryConnectorFactory
       Throwable z = e.getTargetException();
       if (z instanceof Error)
         throw (Error)z;
+      else if (z instanceof RuntimeException)
+        throw (RuntimeException)z;
       else
         throw (ManifoldCFException)z;
     }
@@ -244,6 +246,8 @@ public class RepositoryConnectorFactory
       Throwable z = e.getTargetException();
       if (z instanceof Error)
         throw (Error)z;
+      else if (z instanceof RuntimeException)
+        throw (RuntimeException)z;
       else
         throw (ManifoldCFException)z;
     }
@@ -337,9 +341,9 @@ public class RepositoryConnectorFactory
           }
         }
         if (e instanceof ManifoldCFException)
-        {
           throw (ManifoldCFException)e;
-        }
+	else if (e instanceof RuntimeException)
+          throw (RuntimeException)e;
         throw (Error)e;
       }
       i++;
@@ -620,6 +624,8 @@ public class RepositoryConnectorFactory
           Throwable z = e.getTargetException();
           if (z instanceof Error)
             throw (Error)z;
+          else if (z instanceof RuntimeException)
+            throw (RuntimeException)z;
           else
             throw (ManifoldCFException)z;
         }



Mime
View raw message