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);
}