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 892CB10474 for ; Mon, 6 Jan 2014 22:09:33 +0000 (UTC) Received: (qmail 67419 invoked by uid 500); 6 Jan 2014 22:09:32 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 67366 invoked by uid 500); 6 Jan 2014 22:09:32 -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 67359 invoked by uid 99); 6 Jan 2014 22:09:32 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Jan 2014 22:09:32 +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, 06 Jan 2014 22:09:31 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E248723889BF; Mon, 6 Jan 2014 22:09:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1556049 - /cxf/trunk/core/src/main/java/org/apache/cxf/bus/osgi/CXFActivator.java Date: Mon, 06 Jan 2014 22:09:11 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140106220911.E248723889BF@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Mon Jan 6 22:09:11 2014 New Revision: 1556049 URL: http://svn.apache.org/r1556049 Log: Fix NPE on shutdown Modified: cxf/trunk/core/src/main/java/org/apache/cxf/bus/osgi/CXFActivator.java Modified: cxf/trunk/core/src/main/java/org/apache/cxf/bus/osgi/CXFActivator.java URL: http://svn.apache.org/viewvc/cxf/trunk/core/src/main/java/org/apache/cxf/bus/osgi/CXFActivator.java?rev=1556049&r1=1556048&r2=1556049&view=diff ============================================================================== --- cxf/trunk/core/src/main/java/org/apache/cxf/bus/osgi/CXFActivator.java (original) +++ cxf/trunk/core/src/main/java/org/apache/cxf/bus/osgi/CXFActivator.java Mon Jan 6 22:09:11 2014 @@ -50,7 +50,6 @@ public class CXFActivator implements Bun private ServiceTracker configAdminTracker; private CXFExtensionBundleListener cxfBundleListener; private ServiceRegistration workQueueServiceRegistration; - private ServiceRegistration wqSingleConfigRegistratin; /** {@inheritDoc}*/ public void start(BundleContext context) throws Exception { @@ -119,7 +118,6 @@ public class CXFActivator implements Bun cxfBundleListener.shutdown(); workQueues.shutDown(); workQueueServiceRegistration.unregister(); - wqSingleConfigRegistratin.unregister(); configAdminTracker.close(); ExtensionRegistry.removeExtensions(extensions); }