felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pde...@apache.org
Subject svn commit: r1626902 - /felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ConfigurationDependencyImpl.java
Date Mon, 22 Sep 2014 21:55:20 GMT
Author: pderop
Date: Mon Sep 22 21:55:20 2014
New Revision: 1626902

URL: http://svn.apache.org/r1626902
Log:
Catch IllegalStateException when unregistering a managed service, if the corresponding service
is already unregistered.

Modified:
    felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ConfigurationDependencyImpl.java

Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ConfigurationDependencyImpl.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ConfigurationDependencyImpl.java?rev=1626902&r1=1626901&r2=1626902&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ConfigurationDependencyImpl.java
(original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ConfigurationDependencyImpl.java
Mon Sep 22 21:55:20 2014
@@ -94,7 +94,9 @@ public class ConfigurationDependencyImpl
     public void stop() {
         super.stop();
         if (m_registration != null) {
-        	m_registration.unregister();
+            try {
+                m_registration.unregister();
+            } catch (IllegalStateException e) {}
         	m_registration = null;
         }
     }



Mime
View raw message