Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-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 BF4DA92F7 for ; Thu, 13 Oct 2011 11:20:55 +0000 (UTC) Received: (qmail 63620 invoked by uid 500); 13 Oct 2011 11:20:55 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 63573 invoked by uid 500); 13 Oct 2011 11:20:55 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 63566 invoked by uid 99); 13 Oct 2011 11:20:55 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Oct 2011 11:20:55 +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; Thu, 13 Oct 2011 11:20:53 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 0271423888EA for ; Thu, 13 Oct 2011 11:20:32 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1182786 - /cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/osgi/OSGiExtensionLocator.java Date: Thu, 13 Oct 2011 11:20:31 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111013112032.0271423888EA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Thu Oct 13 11:20:31 2011 New Revision: 1182786 URL: http://svn.apache.org/viewvc?rev=1182786&view=rev Log: Add an NPE guard Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/osgi/OSGiExtensionLocator.java Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/osgi/OSGiExtensionLocator.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/osgi/OSGiExtensionLocator.java?rev=1182786&r1=1182785&r2=1182786&view=diff ============================================================================== --- cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/osgi/OSGiExtensionLocator.java (original) +++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/osgi/OSGiExtensionLocator.java Thu Oct 13 11:20:31 2011 @@ -71,6 +71,9 @@ public class OSGiExtensionLocator implem = new ConcurrentHashMap(); public void updated(Dictionary d) throws ConfigurationException { + if (d == null) { + return; + } String s = (String)d.get("org.apache.cxf.workqueue.names"); if (s != null) { String s2[] = s.split(",");