JBPM-3814, BZ 1002724 Bugfixes with regards to concurrency (cherry pi…

…cked from commit c29dfae)
kiegroup · Oct 3, 2013 · 188f1d3 · 188f1d3
1 parent 711b69e
commit 188f1d3
Showing 1 changed file with 6 additions and 11 deletions.
diff --git a/kie-spring/src/main/java/org/kie/spring/persistence/KieSpringJpaManager.java b/kie-spring/src/main/java/org/kie/spring/persistence/KieSpringJpaManager.java
@@ -124,7 +124,12 @@ public void endCommandScopedEntityManager() {
             if (this.env.get(EnvironmentName.CMD_SCOPED_ENTITY_MANAGER) != null) {
                 getCommandScopedPersistenceContext().close();
             }
-
+
+            // Code formerly in the clearPersistenceContext method.
+            EntityManager cmdScopedEntityManager = (EntityManager) this.env.get(EnvironmentName.CMD_SCOPED_ENTITY_MANAGER);
+            if (cmdScopedEntityManager != null) {
+                cmdScopedEntityManager.clear();
+            }
         }
     }
 
@@ -148,14 +153,4 @@ public ProcessPersistenceContext getProcessPersistenceContext() {
         return new JpaProcessPersistenceContext((EntityManager) this.env.get(EnvironmentName.CMD_SCOPED_ENTITY_MANAGER));
     }
 
-    public void clearPersistenceContext() {
-        if (TransactionSynchronizationManager.hasResource("cmdEM")) {
-            EntityManager cmdScopedEntityManager = (EntityManager) this.env.get(EnvironmentName.CMD_SCOPED_ENTITY_MANAGER);
-            if (cmdScopedEntityManager != null) {
-                cmdScopedEntityManager.clear();
-            }
-
-        }
-    }
-
 }