vitalif
/
openesb-components
mirror of https://github.com/vitalif/openesb-components
1
0
Fork 0
Code Issues Releases Wiki Activity

Enclosed scopes unregister themselves now if they carry no compensation handlers.

master
Alexander Lomov 2014-01-03 19:32:11 +04:00
parent 84c93a67ed
commit 183d50ed81
3 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ojc-core/bpelse/bpelcore/src/com/sun/jbi/engine/bpel/core/bpel/model/runtime/FaultHandlingContext.java
View File

@ -109,6 +109,12 @@ public interface FaultHandlingContext {
*/
void registerEnclosedScope(FaultHandlingContext enclosedScope);
/**
* Removes itself from the parent context.
* @param enclosedScope
*/
void unregisterEnclosedScope(FaultHandlingContext enclosedScope);
/**
* When a callframe is created it will be registered with the FaultHandlingContext.
* This is used by the FaultHandlingContext to remove any callframe that is waiting

10
ojc-core/bpelse/bpelcore/src/com/sun/jbi/engine/bpel/core/bpel/model/runtime/impl/BPELProcessInstanceImpl.java
View File

@ -860,7 +860,15 @@ public class BPELProcessInstanceImpl extends StructuredActivityUnitImpl implemen
*/
public void registerEnclosedScope(FaultHandlingContext enclosedScope) {
enclosedScopes.add(enclosedScope);
}
}
/**
* @see com.sun.jbi.engine.bpel.core.bpel.model.runtime.FaultHandlingContext#unregisterEnclosedScope(
* com.sun.jbi.engine.bpel.core.bpel.model.runtime.FaultHandlingContext)
*/
public void unregisterEnclosedScope(FaultHandlingContext enclosedScope) {
enclosedScopes.remove(enclosedScope);
}
/**
* @see com.sun.jbi.engine.bpel.core.bpel.model.runtime.FaultHandlingContext#notifyFault(

16
ojc-core/bpelse/bpelcore/src/com/sun/jbi/engine/bpel/core/bpel/model/runtime/impl/ScopeUnitImpl.java
View File

@ -291,6 +291,7 @@ public class ScopeUnitImpl extends StructuredActivityUnitImpl implements Context
currentScopeState = ScopeState.Completed;
// clear all the FH related data as the scope has completed.
clearFHRelatedData();
unregisterFromParent(this);
// push this completed scope instance to the parent sope stack of completed scopes.
mCompletionOrder = getParentContext().getFaultHandlingContext().pushCompletedScope(this);
updateScopeOnState(rObjs);
@ -310,6 +311,7 @@ public class ScopeUnitImpl extends StructuredActivityUnitImpl implements Context
currentScopeState = ScopeState.Completed;
// clear all the FH related data as the scope has completed.
clearFHRelatedData();
unregisterFromParent(this);
// push this completed scope instance to the parent scope stack of completed scopes.
mCompletionOrder = getParentContext().getFaultHandlingContext().pushCompletedScope(this);
updateScopeOnState(rObjs);
@ -391,6 +393,7 @@ public class ScopeUnitImpl extends StructuredActivityUnitImpl implements Context
currentScopeState = ScopeState.Completed;
// clear all the FH related data as the scope has completed.
clearFHRelatedData();
unregisterFromParent(this);
// push this completed scope instance to the parent scope stack of completed scopes.
mCompletionOrder = getParentContext().getFaultHandlingContext().pushCompletedScope(this);
updateScopeOnState(rObjs);
@ -712,7 +715,15 @@ public class ScopeUnitImpl extends StructuredActivityUnitImpl implements Context
*/
public void registerEnclosedScope(FaultHandlingContext enclosedScope) {
enclosedScopes.add(enclosedScope);
}
}
public void unregisterEnclosedScope(FaultHandlingContext enclosedScope) {
enclosedScopes.remove(enclosedScope);
}
private void unregisterFromParent(FaultHandlingContext scope) {
mContext.getFaultHandlingContext().unregisterEnclosedScope(scope);
}
/**
* @see com.sun.jbi.engine.bpel.core.bpel.model.runtime.FaultHandlingContext#notifyFault(
@ -807,6 +818,7 @@ public class ScopeUnitImpl extends StructuredActivityUnitImpl implements Context
// clean the FH related data.
clearFHRelatedData();
unregisterFromParent(this);
}
private void clearFHRelatedData() {
@ -1252,6 +1264,7 @@ public class ScopeUnitImpl extends StructuredActivityUnitImpl implements Context
removeVariableReferences();
frame.getProcessInstance().getPersistenctMgr().updateState(this,
mContext.getStateContext().getState(), true);
unregisterFromParent(this);
}
/**
@ -1460,6 +1473,7 @@ public class ScopeUnitImpl extends StructuredActivityUnitImpl implements Context
*/
private void updateScopeStateAsDone(boolean persistenceEnabled, RequiredObjects rObjs) {
currentScopeState = ScopeState.Done;
unregisterFromParent(this);
// update the Scope on the StateImpl
if (persistenceEnabled) {
updateScopeOnState(rObjs);