svn commit: r1690665 - in /manifoldcf/trunk: ./ framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/

[kwright]

Author: kwright
Date: Mon Jul 13 13:14:28 2015
New Revision: 1690665

URL: http://svn.apache.org/r1690665
Log:
Fix for CONNECTORS-1222.

Modified:
    manifoldcf/trunk/CHANGES.txt
    
manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/OutputConnectionManagerFactory.java
    
manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/TransformationConnectionManagerFactory.java

Modified: manifoldcf/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1690665&r1=1690664&r2=1690665&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Mon Jul 13 13:14:28 2015
@@ -3,6 +3,9 @@ $Id$
 
 ======================= 2.2-dev =====================
 
+CONNECTORS-1222: Handle unregistered connector class in getActivitiesList().
+(Thomas Daniel, Karl Wright)
+
 CONNECTORS-1221: Update documentation for properties.xml to
 include new ldap authentication properties.
 (Karl Wright)

Modified: 
manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/OutputConnectionManagerFactory.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/OutputConnectionManagerFactory.java?rev=1690665&r1=1690664&r2=1690665&view=diff
==============================================================================
--- 
manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/OutputConnectionManagerFactory.java
 (original)
+++ 
manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/OutputConnectionManagerFactory.java
 Mon Jul 13 13:14:28 2015
@@ -71,10 +71,13 @@ public class OutputConnectionManagerFact
     {
       String connectionName = connection.getName();
       String[] activities = 
OutputConnectorFactory.getActivitiesList(tc,connection.getClassName());
-      for (String activityName : activities)
+      if (activities != null)
       {
-        String activity = 
ManifoldCF.qualifyOutputActivityName(activityName,connectionName);
-        map.add(activity);
+        for (String activityName : activities)
+        {
+          String activity = 
ManifoldCF.qualifyOutputActivityName(activityName,connectionName);
+          map.add(activity);
+        }
       }
     }
     String[] rval = new String[map.size()];

Modified: 
manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/TransformationConnectionManagerFactory.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/TransformationConnectionManagerFactory.java?rev=1690665&r1=1690664&r2=1690665&view=diff
==============================================================================
--- 
manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/TransformationConnectionManagerFactory.java
 (original)
+++ 
manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/TransformationConnectionManagerFactory.java
 Mon Jul 13 13:14:28 2015
@@ -71,10 +71,13 @@ public class TransformationConnectionMan
     {
       String connectionName = connection.getName();
       String[] activities = 
TransformationConnectorFactory.getActivitiesList(tc,connection.getClassName());
-      for (String baseActivity : activities)
+      if (activities != null)
       {
-        String activity = 
ManifoldCF.qualifyTransformationActivityName(baseActivity, connectionName);
-        map.add(activity);
+        for (String baseActivity : activities)
+        {
+          String activity = 
ManifoldCF.qualifyTransformationActivityName(baseActivity, connectionName);
+          map.add(activity);
+        }
       }
     }
     String[] rval = new String[map.size()];