You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@aries.apache.org by gn...@apache.org on 2012/05/24 15:02:40 UTC

svn commit: r1342239 - /aries/branches/blueprint-0.3.2-fixes/transaction-manager/src/main/java/org/apache/aries/transaction/Activator.java

Author: gnodet
Date: Thu May 24 13:02:40 2012
New Revision: 1342239

URL: http://svn.apache.org/viewvc?rev=1342239&view=rev
Log:
[ARIES-856] Possible deadlock when starting the transaction manager

Modified:
    aries/branches/blueprint-0.3.2-fixes/transaction-manager/src/main/java/org/apache/aries/transaction/Activator.java

Modified: aries/branches/blueprint-0.3.2-fixes/transaction-manager/src/main/java/org/apache/aries/transaction/Activator.java
URL: http://svn.apache.org/viewvc/aries/branches/blueprint-0.3.2-fixes/transaction-manager/src/main/java/org/apache/aries/transaction/Activator.java?rev=1342239&r1=1342238&r2=1342239&view=diff
==============================================================================
--- aries/branches/blueprint-0.3.2-fixes/transaction-manager/src/main/java/org/apache/aries/transaction/Activator.java (original)
+++ aries/branches/blueprint-0.3.2-fixes/transaction-manager/src/main/java/org/apache/aries/transaction/Activator.java Thu May 24 13:02:40 2012
@@ -42,8 +42,8 @@ public class Activator implements Bundle
         this.bundleContext = bundleContext;
         Hashtable props = new Hashtable();
         props.put(Constants.SERVICE_PID, PID);
-        bundleContext.registerService(ManagedService.class.getName(), this, props);
         updated(props);
+        bundleContext.registerService(ManagedService.class.getName(), this, props);
     }
 
     public void stop(BundleContext context) throws Exception {