svn commit: r1693249 - /aries/trunk/jpa/jpa-support/src/main/java/org/apache/aries/jpa/support/impl/EMSupplierImpl.java

[cschneider]

Author: cschneider
Date: Wed Jul 29 12:11:48 2015
New Revision: 1693249

URL: http://svn.apache.org/r1693249
Log:
Workaround for FELIX-4976

Modified:
    
aries/trunk/jpa/jpa-support/src/main/java/org/apache/aries/jpa/support/impl/EMSupplierImpl.java

Modified: 
aries/trunk/jpa/jpa-support/src/main/java/org/apache/aries/jpa/support/impl/EMSupplierImpl.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-support/src/main/java/org/apache/aries/jpa/support/impl/EMSupplierImpl.java?rev=1693249&r1=1693248&r2=1693249&view=diff
==============================================================================
--- 
aries/trunk/jpa/jpa-support/src/main/java/org/apache/aries/jpa/support/impl/EMSupplierImpl.java
 (original)
+++ 
aries/trunk/jpa/jpa-support/src/main/java/org/apache/aries/jpa/support/impl/EMSupplierImpl.java
 Wed Jul 29 12:11:48 2015
@@ -57,6 +57,7 @@ public class EMSupplierImpl implements E
     private CountDownLatch emsToShutDown;
     private Coordinator coordinator;
     private String unitName;
+    private ThreadLocal<Coordination> localCoordination = new ThreadLocal<>();
 
     public EMSupplierImpl(String unitName, final EntityManagerFactory emf, 
Coordinator coordinator) {
         this.unitName = unitName;
@@ -141,7 +142,7 @@ public class EMSupplierImpl implements E
 
     @Override
     public void preCall() {
-        coordinator.begin("jpa." + unitName, 0);
+        localCoordination.set(coordinator.begin("jpa." + unitName, 0));
     }
 
     @Override
@@ -149,6 +150,7 @@ public class EMSupplierImpl implements E
         try {
             Coordination coord = coordinator.pop();
             coord.end();
+            localCoordination.set(null);
         } catch (Throwable t) {
             LOG.warn("Error ending coord", t);
         }