Return-Path: X-Original-To: apmail-manifoldcf-commits-archive@www.apache.org Delivered-To: apmail-manifoldcf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 09CDD10FAF for ; Mon, 21 Oct 2013 13:47:26 +0000 (UTC) Received: (qmail 9872 invoked by uid 500); 21 Oct 2013 13:47:25 -0000 Delivered-To: apmail-manifoldcf-commits-archive@manifoldcf.apache.org Received: (qmail 9811 invoked by uid 500); 21 Oct 2013 13:47:19 -0000 Mailing-List: contact commits-help@manifoldcf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@manifoldcf.apache.org Delivered-To: mailing list commits@manifoldcf.apache.org Received: (qmail 9795 invoked by uid 99); 21 Oct 2013 13:47:18 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Oct 2013 13:47:18 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Oct 2013 13:47:16 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 51055238889B; Mon, 21 Oct 2013 13:46:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r1534154 - in /manifoldcf/trunk: CHANGES.txt framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ManifoldCF.java Date: Mon, 21 Oct 2013 13:46:55 -0000 To: commits@manifoldcf.apache.org From: kwright@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131021134655.51055238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kwright Date: Mon Oct 21 13:46:54 2013 New Revision: 1534154 URL: http://svn.apache.org/r1534154 Log: Fix for CONNECTORS-790. Modified: manifoldcf/trunk/CHANGES.txt manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ManifoldCF.java Modified: manifoldcf/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1534154&r1=1534153&r2=1534154&view=diff ============================================================================== --- manifoldcf/trunk/CHANGES.txt (original) +++ manifoldcf/trunk/CHANGES.txt Mon Oct 21 13:46:54 2013 @@ -5,6 +5,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/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ManifoldCF.java URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ManifoldCF.java?rev=1534154&r1=1534153&r2=1534154&view=diff ============================================================================== --- manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ManifoldCF.java (original) +++ manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ManifoldCF.java Mon Oct 21 13:46:54 2013 @@ -2004,6 +2004,8 @@ public class ManifoldCF extends org.apac protected static int apiReadJobStatuses(IThreadContext tc, Configuration output, Map> queryParameters) throws ManifoldCFException { + if (queryParameters == null) + queryParameters = new HashMap>(); int maxCount; List maxCountList = queryParameters.get("maxcount"); if (maxCountList == null || maxCountList.size() == 0)