svn commit: r1784905 - /aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/Activator.java

[csierra]

Author: csierra
Date: Wed Mar  1 10:07:50 2017
New Revision: 1784905

URL: http://svn.apache.org/viewvc?rev=1784905&view=rev
Log:
[ARIES-CDI] Missing unregistration and source format

Modified:
    
aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/Activator.java

Modified: 
aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/Activator.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/Activator.java?rev=1784905&r1=1784904&r2=1784905&view=diff
==============================================================================
--- 
aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/Activator.java
 (original)
+++ 
aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/Activator.java
 Wed Mar  1 10:07:50 2017
@@ -56,7 +56,7 @@ public class Activator extends AbstractE
                _listenerTracker = new ServiceTracker<>(_bundleContext, 
CdiListener.class, new CdiListenerCustomizer());
                _listenerTracker.open();
 
-               registerCdiCommand(_bundleContext);
+               registerCdiCommand();
 
                super.start(bundleContext);
 
@@ -65,7 +65,7 @@ public class Activator extends AbstractE
                }
        }
 
-       private void registerCdiCommand(BundleContext bundleContext) {
+       private void registerCdiCommand() {
                Dictionary<String, Object> properties = new Hashtable<>();
                properties.put("osgi.command.scope", "cdi");
                properties.put("osgi.command.function", new String[] {"list", 
"info"});
@@ -87,6 +87,10 @@ public class Activator extends AbstractE
                if (_log.isDebugEnabled()) {
                        _log.debug("CDIe - stoped {}", 
bundleContext.getBundle());
                }
+
+               if (_commandRegistration != null) {
+                       _commandRegistration.unregister();
+               }
        }
 
        @Override
@@ -116,7 +120,7 @@ public class Activator extends AbstractE
                }
        }
 
-       private final boolean requiresCdiExtender(Bundle bundle) {
+       private boolean requiresCdiExtender(Bundle bundle) {
                BundleWiring bundleWiring = bundle.adapt(BundleWiring.class);
                List<BundleWire> requiredBundleWires = 
bundleWiring.getRequiredWires(EXTENDER_NAMESPACE);