Add itemSysKey as a variable of the workflow during initialization.

Use this for creating the shared History map.
Lock event writing on the Workflow rather than the Activity to keep the
History in the transaction. 

1 files changed, 4 insertions, 4 deletions

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/Import.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/Import.java
index 9b25546..29d4c54 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/Import.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/Import.java
@@ -76,16 +76,16 @@ public class Import extends PredefinedStep
 		Event event = hist.addEvent(agent.getAgentName(), getCurrentAgentRole(), getName(), getPath(), getType(), schemaName, schemaVersion, getStateMachine().getName(), getStateMachine().getVersion(), getStateMachine().getTransition(transitionID), viewpoint, timestamp);

 

 		try {

-			storage.put(itemSysKey, new Outcome(event.getID(), requestData, schemaName, schemaVersion), this);

-			storage.put(itemSysKey, new Viewpoint(itemSysKey, schemaName, viewpoint, schemaVersion, event.getID()), this);

+			storage.put(itemSysKey, new Outcome(event.getID(), requestData, schemaName, schemaVersion), locker);

+			storage.put(itemSysKey, new Viewpoint(itemSysKey, schemaName, viewpoint, schemaVersion, event.getID()), locker);

 			if (!"last".equals(viewpoint))

-				storage.put(itemSysKey, new Viewpoint(itemSysKey, schemaName, "last", schemaVersion, event.getID()), this);

+				storage.put(itemSysKey, new Viewpoint(itemSysKey, schemaName, "last", schemaVersion, event.getID()), locker);

 		} catch (ClusterStorageException e) {

 			Logger.error(e);

 			storage.abort(locker);

 			throw new InvalidDataException("Could not store imported outcome. Rolled back.");

 		}

-		storage.commit(this);

+		storage.commit(locker);

 		return requestData;

     }

 }