svn commit: r1722429 - /felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ComponentImpl.java

[pderop]

Author: pderop
Date: Thu Dec 31 09:06:08 2015
New Revision: 1722429

URL: http://svn.apache.org/viewvc?rev=1722429&view=rev
Log:
FELIX-5153: DM4 calls stop before ungetService() on ServiceFactory components.

Modified:
    
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ComponentImpl.java

Modified: 
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ComponentImpl.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ComponentImpl.java?rev=1722429&r1=1722428&r2=1722429&view=diff
==============================================================================
--- 
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ComponentImpl.java
 (original)
+++ 
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ComponentImpl.java
 Thu Dec 31 09:06:08 2015
@@ -1308,7 +1308,7 @@ public class ComponentImpl implements Co
     private void unregisterService() {
         if (m_serviceName != null && m_registration != null) {
             try {
-                if (m_bundle != null && m_bundle.getState() == Bundle.ACTIVE) {
+                if (m_bundle != null && (m_bundle.getState() == Bundle.ACTIVE 
|| m_bundle.getState() == Bundle.STOPPING)) {
                     m_registration.unregister();
                 }
             } catch (IllegalStateException e) { /* Should we really log this ? 
*/}