From 8fb24d20315291968cbb05bf45f41e73c22a80da Mon Sep 17 00:00:00 2001
From: David BRASSELY <brasseld@gmail.com>
Date: Thu, 10 Apr 2014 14:26:12 +0200
Subject: [PATCH] ESBCOMP-70 Fix to improve memory leak in BPEL-SE

---
 .../runtime/impl/BPELProcessInstanceImpl.java | 26 ++++++++++++-------
 .../model/runtime/impl/ScopeUnitImpl.java     | 23 +++++++++++++++-
 2 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/ojc-core/bpelse/bpelcore/src/com/sun/jbi/engine/bpel/core/bpel/model/runtime/impl/BPELProcessInstanceImpl.java b/ojc-core/bpelse/bpelcore/src/com/sun/jbi/engine/bpel/core/bpel/model/runtime/impl/BPELProcessInstanceImpl.java
index 011634f2e..9f1eec0c9 100755
--- a/ojc-core/bpelse/bpelcore/src/com/sun/jbi/engine/bpel/core/bpel/model/runtime/impl/BPELProcessInstanceImpl.java
+++ b/ojc-core/bpelse/bpelcore/src/com/sun/jbi/engine/bpel/core/bpel/model/runtime/impl/BPELProcessInstanceImpl.java
@@ -1221,15 +1221,21 @@ public class BPELProcessInstanceImpl extends StructuredActivityUnitImpl implemen
 	 * 	pushCompletedScope(com.sun.jbi.engine.bpel.core.bpel.model.runtime.Context)
 	 */
     public int pushCompletedScope(Context completedScope) {
-		synchronized (mCompletedScopes) {
-			if (currentProcessState == ProcessState.Running 
-					|| currentProcessState == ProcessState.WaitingForEventsToComplete) {
-				mCompletedScopes.push(completedScope);
-				return mCompletedScopes.size();
-			} else {
-				return 0;
-			}
-		}
+        synchronized (mCompletedScopes) {
+            if(completedScope instanceof ScopeUnitImpl){
+                
+                ScopeUnitImpl completedScopeUnit = (ScopeUnitImpl)completedScope;
+                
+                if((completedScopeUnit.hasCompensationHandler() || completedScopeUnit.hasFaultHandler() || completedScopeUnit.hasEventHandler() || completedScopeUnit.hasTerminationHandler()) && 
+                        (currentProcessState == ProcessState.Running || currentProcessState == ProcessState.WaitingForEventsToComplete))
+                {
+                    mCompletedScopes.push(completedScope);
+                    return mCompletedScopes.size();
+                }
+            }
+        }
+        return 0;
+        
     }
     
     /*
@@ -1682,4 +1688,4 @@ public class BPELProcessInstanceImpl extends StructuredActivityUnitImpl implemen
             return false;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/ojc-core/bpelse/bpelcore/src/com/sun/jbi/engine/bpel/core/bpel/model/runtime/impl/ScopeUnitImpl.java b/ojc-core/bpelse/bpelcore/src/com/sun/jbi/engine/bpel/core/bpel/model/runtime/impl/ScopeUnitImpl.java
index 6d3859816..cb8563287 100755
--- a/ojc-core/bpelse/bpelcore/src/com/sun/jbi/engine/bpel/core/bpel/model/runtime/impl/ScopeUnitImpl.java
+++ b/ojc-core/bpelse/bpelcore/src/com/sun/jbi/engine/bpel/core/bpel/model/runtime/impl/ScopeUnitImpl.java
@@ -57,6 +57,7 @@ import com.sun.bpel.model.meta.RPartnerLink;
 import com.sun.bpel.model.meta.RReply;
 import com.sun.bpel.model.meta.RStartElement;
 import com.sun.bpel.model.meta.RVariable;
+import com.sun.bpel.model.meta.impl.RScopeImpl;
 import com.sun.jbi.engine.bpel.core.bpel.engine.BPELProcessInstance;
 import com.sun.jbi.engine.bpel.core.bpel.engine.BPELProcessManager;
 import com.sun.jbi.engine.bpel.core.bpel.engine.BusinessProcessInstanceThread;
@@ -1352,6 +1353,27 @@ public class ScopeUnitImpl extends StructuredActivityUnitImpl implements Context
 		}
 	}
 	
+	public boolean hasCompensationHandler() {
+        return mAct instanceof RScopeImpl && 
+            ((RScopeImpl)mAct).getCompensationHandler() != null;
+    }
+    
+    public boolean hasFaultHandler() {
+        return mAct instanceof RScopeImpl && 
+            ((RScopeImpl)mAct).getFaultHandlers() != null;
+    }
+    
+    public boolean hasTerminationHandler() {
+        return mAct instanceof RScopeImpl && 
+            ((RScopeImpl)mAct).getTerminationHandler() != null;
+    }
+    
+    public boolean hasEventHandler() {
+        return mAct instanceof RScopeImpl && 
+            ((RScopeImpl)mAct).getEventHandlers() != null;
+    }
+	
+	
 	private Context popCompletedScope() {
 		try {
 			return mCompletedScopes.pop();
@@ -1505,4 +1527,3 @@ public class ScopeUnitImpl extends StructuredActivityUnitImpl implements Context
         }
     }
 }
-