commit 4c1114a5771d25bb6618be23e80ce5e891a5bdce
author Guillaume Nodet <gnodet@apache.org> Fri Dec 14 16:39:02 2012 +0000
committer Guillaume Nodet <gnodet@apache.org> Fri Dec 14 16:39:02 2012 +0000
tree 1358f16b43571cf783fe4cb0e49eb8724e20d04f
parent 817c41ed912abbe63d0e6f8112cd60737397f5b5

[FELIX-3824] Possible IllegalStateException thrown while unregistering bundle services

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1421969 13f79535-47bb-0310-9956-ffa450edef68

framework/src/main/java/org/apache/felix/framework/ServiceRegistry.java

diff --git a/framework/src/main/java/org/apache/felix/framework/ServiceRegistry.java b/framework/src/main/java/org/apache/felix/framework/ServiceRegistry.java
index 9bf5d31..52e2c92 100644
--- a/framework/src/main/java/org/apache/felix/framework/ServiceRegistry.java
+++ b/framework/src/main/java/org/apache/felix/framework/ServiceRegistry.java
@@ -191,7 +191,14 @@
         {
             if (((ServiceRegistrationImpl) regs[i]).isValid())
             {
-                regs[i].unregister();
+                try
+                {
+                    regs[i].unregister();
+                }
+                catch (IllegalStateException e)
+                {
+                    // Ignore exception if the service has already been unregistered
+                }
             }
         }