Author: kwright
Date: Mon Oct 21 13:48:03 2013
New Revision: 1534155
URL: http://svn.apache.org/r1534155
Log:
Pull up fix for CONNECTORS-790 from trunk.
Modified:
manifoldcf/branches/release-1.4-branch/ (props changed)
manifoldcf/branches/release-1.4-branch/CHANGES.txt
manifoldcf/branches/release-1.4-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ManifoldCF.java
Propchange: manifoldcf/branches/release-1.4-branch/
------------------------------------------------------------------------------
Merged /manifoldcf/trunk:r1534154
Modified: manifoldcf/branches/release-1.4-branch/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.4-branch/CHANGES.txt?rev=1534155&r1=1534154&r2=1534155&view=diff
==============================================================================
--- manifoldcf/branches/release-1.4-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-1.4-branch/CHANGES.txt Mon Oct 21 13:48:03 2013
@@ -3,6 +3,9 @@ $Id$
======================= Release 1.4 =====================
+CONNECTORS-790: Fix NPE when reading job status via API.
+(Erlend Garåsen, Karl Wright)
+
CONNECTORS-789: Fix broken metadata field display in SharePoint
connector UI.
(Mark Libucha, Karl Wright)
Modified:
manifoldcf/branches/release-1.4-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ManifoldCF.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.4-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ManifoldCF.java?rev=1534155&r1=1534154&r2=1534155&view=diff
==============================================================================
---
manifoldcf/branches/release-1.4-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ManifoldCF.java
(original)
+++
manifoldcf/branches/release-1.4-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ManifoldCF.java
Mon Oct 21 13:48:03 2013
@@ -2004,6 +2004,8 @@ public class ManifoldCF extends org.apac
protected static int apiReadJobStatuses(IThreadContext tc, Configuration
output, Map<String,List<String>> queryParameters)
throws ManifoldCFException
{
+ if (queryParameters == null)
+ queryParameters = new HashMap<String,List<String>>();
int maxCount;
List<String> maxCountList = queryParameters.get("maxcount");
if (maxCountList == null || maxCountList.size() == 0)
