You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2012/09/21 20:58:03 UTC
svn commit: r1388619 - in /manifoldcf/branches/release-1.0-branch: ./
framework/crawler-ui/src/main/webapp/
Author: kwright
Date: Fri Sep 21 18:58:02 2012
New Revision: 1388619
URL: http://svn.apache.org/viewvc?rev=1388619&view=rev
Log:
Pull up fix for CONNECTORS-537.
Modified:
manifoldcf/branches/release-1.0-branch/ (props changed)
manifoldcf/branches/release-1.0-branch/CHANGES.txt
manifoldcf/branches/release-1.0-branch/framework/crawler-ui/src/main/webapp/maxactivityreport.jsp
manifoldcf/branches/release-1.0-branch/framework/crawler-ui/src/main/webapp/maxbandwidthreport.jsp
manifoldcf/branches/release-1.0-branch/framework/crawler-ui/src/main/webapp/resultreport.jsp
manifoldcf/branches/release-1.0-branch/framework/crawler-ui/src/main/webapp/simplereport.jsp
Propchange: manifoldcf/branches/release-1.0-branch/
------------------------------------------------------------------------------
Merged /manifoldcf/trunk:r1388617
Modified: manifoldcf/branches/release-1.0-branch/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.0-branch/CHANGES.txt?rev=1388619&r1=1388618&r2=1388619&view=diff
==============================================================================
--- manifoldcf/branches/release-1.0-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-1.0-branch/CHANGES.txt Fri Sep 21 18:58:02 2012
@@ -3,6 +3,10 @@ $Id$
======================= 1.0 =====================
+CONNECTORS-537: NPE when trying to display a history report when
+the corresponding connector is unregistered.
+(Erlend Garason, Karl Wright)
+
CONNECTORS-533: Do not forgo xxx-README files in connector-lib-proprietary.
(Karl Wright)
Modified: manifoldcf/branches/release-1.0-branch/framework/crawler-ui/src/main/webapp/maxactivityreport.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.0-branch/framework/crawler-ui/src/main/webapp/maxactivityreport.jsp?rev=1388619&r1=1388618&r2=1388619&view=diff
==============================================================================
--- manifoldcf/branches/release-1.0-branch/framework/crawler-ui/src/main/webapp/maxactivityreport.jsp (original)
+++ manifoldcf/branches/release-1.0-branch/framework/crawler-ui/src/main/webapp/maxactivityreport.jsp Fri Sep 21 18:58:02 2012
@@ -351,7 +351,7 @@ if (maintenanceUnderway == false)
String[] outputActivityList = OutputConnectionManagerFactory.getAllOutputActivities(threadContext);
String[] connectorActivityList = RepositoryConnectorFactory.getActivitiesList(threadContext,thisConnection.getClassName());
String[] globalActivityList = IRepositoryConnectionManager.activitySet;
- activityList = new String[outputActivityList.length + connectorActivityList.length + globalActivityList.length];
+ activityList = new String[outputActivityList.length + ((connectorActivityList==null)?0:connectorActivityList.length) + globalActivityList.length];
int k2 = 0;
int j;
if (outputActivityList != null)
Modified: manifoldcf/branches/release-1.0-branch/framework/crawler-ui/src/main/webapp/maxbandwidthreport.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.0-branch/framework/crawler-ui/src/main/webapp/maxbandwidthreport.jsp?rev=1388619&r1=1388618&r2=1388619&view=diff
==============================================================================
--- manifoldcf/branches/release-1.0-branch/framework/crawler-ui/src/main/webapp/maxbandwidthreport.jsp (original)
+++ manifoldcf/branches/release-1.0-branch/framework/crawler-ui/src/main/webapp/maxbandwidthreport.jsp Fri Sep 21 18:58:02 2012
@@ -351,7 +351,7 @@ if (maintenanceUnderway == false)
String[] outputActivityList = OutputConnectionManagerFactory.getAllOutputActivities(threadContext);
String[] connectorActivityList = RepositoryConnectorFactory.getActivitiesList(threadContext,thisConnection.getClassName());
String[] globalActivityList = IRepositoryConnectionManager.activitySet;
- activityList = new String[outputActivityList.length + connectorActivityList.length + globalActivityList.length];
+ activityList = new String[outputActivityList.length + ((connectorActivityList==null)?0:connectorActivityList.length) + globalActivityList.length];
int k2 = 0;
int j;
if (outputActivityList != null)
Modified: manifoldcf/branches/release-1.0-branch/framework/crawler-ui/src/main/webapp/resultreport.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.0-branch/framework/crawler-ui/src/main/webapp/resultreport.jsp?rev=1388619&r1=1388618&r2=1388619&view=diff
==============================================================================
--- manifoldcf/branches/release-1.0-branch/framework/crawler-ui/src/main/webapp/resultreport.jsp (original)
+++ manifoldcf/branches/release-1.0-branch/framework/crawler-ui/src/main/webapp/resultreport.jsp Fri Sep 21 18:58:02 2012
@@ -378,7 +378,7 @@ if (maintenanceUnderway == false)
String[] outputActivityList = OutputConnectionManagerFactory.getAllOutputActivities(threadContext);
String[] connectorActivityList = RepositoryConnectorFactory.getActivitiesList(threadContext,thisConnection.getClassName());
String[] globalActivityList = IRepositoryConnectionManager.activitySet;
- activityList = new String[outputActivityList.length + connectorActivityList.length + globalActivityList.length];
+ activityList = new String[outputActivityList.length + ((connectorActivityList==null)?0:connectorActivityList.length) + globalActivityList.length];
int k2 = 0;
int j;
if (outputActivityList != null)
Modified: manifoldcf/branches/release-1.0-branch/framework/crawler-ui/src/main/webapp/simplereport.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.0-branch/framework/crawler-ui/src/main/webapp/simplereport.jsp?rev=1388619&r1=1388618&r2=1388619&view=diff
==============================================================================
--- manifoldcf/branches/release-1.0-branch/framework/crawler-ui/src/main/webapp/simplereport.jsp (original)
+++ manifoldcf/branches/release-1.0-branch/framework/crawler-ui/src/main/webapp/simplereport.jsp Fri Sep 21 18:58:02 2012
@@ -306,7 +306,7 @@ if (maintenanceUnderway == false)
String[] outputActivityList = OutputConnectionManagerFactory.getAllOutputActivities(threadContext);
String[] connectorActivityList = RepositoryConnectorFactory.getActivitiesList(threadContext,thisConnection.getClassName());
String[] globalActivityList = IRepositoryConnectionManager.activitySet;
- activityList = new String[outputActivityList.length + connectorActivityList.length + globalActivityList.length];
+ activityList = new String[outputActivityList.length + ((connectorActivityList==null)?0:connectorActivityList.length) + globalActivityList.length];
int k2 = 0;
int j;
if (outputActivityList != null)