svn commit: r1421969 - /felix/trunk/framework/src/main/java/org/apache/felix/framework/ServiceRegistry.java

[gnodet]

Author: gnodet
Date: Fri Dec 14 16:39:02 2012
New Revision: 1421969

URL: http://svn.apache.org/viewvc?rev=1421969&view=rev
Log:
[FELIX-3824] Possible IllegalStateException thrown while unregistering bundle 
services

Modified:
    
felix/trunk/framework/src/main/java/org/apache/felix/framework/ServiceRegistry.java

Modified: 
felix/trunk/framework/src/main/java/org/apache/felix/framework/ServiceRegistry.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/ServiceRegistry.java?rev=1421969&r1=1421968&r2=1421969&view=diff
==============================================================================
--- 
felix/trunk/framework/src/main/java/org/apache/felix/framework/ServiceRegistry.java
 (original)
+++ 
felix/trunk/framework/src/main/java/org/apache/felix/framework/ServiceRegistry.java
 Fri Dec 14 16:39:02 2012
@@ -191,7 +191,14 @@ public class ServiceRegistry
         {
             if (((ServiceRegistrationImpl) regs[i]).isValid())
             {
-                regs[i].unregister();
+                try
+                {
+                    regs[i].unregister();
+                }
+                catch (IllegalStateException e)
+                {
+                    // Ignore exception if the service has already been 
unregistered
+                }
             }
         }