BZ848855 - Transaction rollback failure after concurrent access: no t…

…ransaction

drools-persistence-jpa/src/main/java/org/drools/persistence/PersistenceContextManager.java

@@ -8,6 +8,8 @@ public interface PersistenceContextManager {
     void beginCommandScopedEntityManager();
 
     void endCommandScopedEntityManager();
+
+    void clearPersistenceContext();
 
     void dispose();
 }

drools-persistence-jpa/src/main/java/org/drools/persistence/SingleSessionCommandService.java

@@ -445,6 +445,8 @@ public void afterCompletion(int status) {
             // always cleanup thread local whatever the result
             Object removedSynchronization = SingleSessionCommandService.synchronizations.remove( this.service );
 
+            this.service.jpm.clearPersistenceContext();
+
             this.service.jpm.endCommandScopedEntityManager();
 
             StatefulKnowledgeSession ksession = this.service.ksession;
@@ -456,7 +458,7 @@ public void afterCompletion(int status) {
                 }
                 ((JPAWorkItemManager) ksession.getWorkItemManager()).clearWorkItems();
             }
-
+            
         }
 
         public void beforeCompletion() {

drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/JpaPersistenceContextManager.java

@@ -111,4 +111,11 @@ public void dispose() {
         }
     }
 
+    public void clearPersistenceContext() {
+        if (this.cmdScopedEntityManager != null && this.cmdScopedEntityManager.isOpen()) {
+            this.cmdScopedEntityManager.clear();
+        }
+
+    }
+
 }

drools-persistence-jpa/src/main/java/org/drools/persistence/map/MapPersistenceContextManager.java

@@ -31,4 +31,8 @@ public void dispose() {
         persistenceContext.close();
     }
 
+    public void clearPersistenceContext() {
+
+    }
+
 }