aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r1719867 - /aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/ServiceRecipe.java
Date Mon, 14 Dec 2015 09:06:42 GMT
Author: gnodet
Date: Mon Dec 14 09:06:42 2015
New Revision: 1719867

URL: http://svn.apache.org/viewvc?rev=1719867&view=rev
Log:
[ARIES-1478] Avoid possible IllegalStateException when registering a service

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

Modified: aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/ServiceRecipe.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/ServiceRecipe.java?rev=1719867&r1=1719866&r2=1719867&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/ServiceRecipe.java
(original)
+++ aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/ServiceRecipe.java
Mon Dec 14 09:06:42 2015
@@ -192,7 +192,7 @@ public class ServiceRecipe extends Abstr
         if (registration.get() == null) {
             ServiceRegistration reg = blueprintContainer.registerService(classArray, new
TriggerServiceFactory(this, metadata), props);
             if (!registration.compareAndSet(null, reg) && registration.get() != reg)
{
-                reg.unregister();
+                AriesFrameworkUtil.safeUnregisterService(reg);
             }
         }
         initialServiceRegistration = false;



Mime
View raw message