svn commit: r1787768 - /aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java

[gnodet]

Author: gnodet
Date: Mon Mar 20 13:21:11 2017
New Revision: 1787768

URL: http://svn.apache.org/viewvc?rev=1787768&view=rev
Log:
Merge commit '777079e5164ca7969ab7c0006b43c6b9e2944db2' into trunk

Modified:
    
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java

Modified: 
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java?rev=1787768&r1=1787767&r2=1787768&view=diff
==============================================================================
--- 
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java
 (original)
+++ 
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java
 Mon Mar 20 13:21:11 2017
@@ -895,6 +895,9 @@ public class BlueprintContainerImpl
         cancelFutureIfPresent();
 
         eventDispatcher.blueprintEvent(new 
BlueprintEvent(BlueprintEvent.DESTROYING, getBundle(), getExtenderBundle()));
+
+        AriesFrameworkUtil.safeUnregisterService(registration);
+
         executors.shutdownNow();
         if (handlerSet != null) {
             handlerSet.removeListener(this);