summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Pielmann2012-11-27 09:03:34 (EST)
committer Stephan Born2012-11-27 09:03:34 (EST)
commit41f09eebfaaa2a0c51463b89f1218a22a1429f4a (patch)
tree53452fe10e6899d04c7492afb4debba32e8927d6
parent6025371794b7f52170ad04266b2d7b834a3e2d2e (diff)
downloadorg.eclipse.stardust.ui.web-41f09eebfaaa2a0c51463b89f1218a22a1429f4a.zip
org.eclipse.stardust.ui.web-41f09eebfaaa2a0c51463b89f1218a22a1429f4a.tar.gz
org.eclipse.stardust.ui.web-41f09eebfaaa2a0c51463b89f1218a22a1429f4a.tar.bz2
CRNT-27160 Web based modeler: Error thrown while model deployment which has a process with process attachment enabled
git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@61174 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/marshaling/ModelElementUnmarshaller.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/marshaling/ModelElementUnmarshaller.java b/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/marshaling/ModelElementUnmarshaller.java
index 48e450a..6949567 100644
--- a/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/marshaling/ModelElementUnmarshaller.java
+++ b/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/marshaling/ModelElementUnmarshaller.java
@@ -889,6 +889,9 @@ public abstract class ModelElementUnmarshaller implements ModelUnmarshaller
{
JsonObject dataPathJson = dataPathes.get(n).getAsJsonObject();
DataPathType dataPath = getModelBuilderFacade().createDataPath();
+ ModelType model = ModelUtils.findContainingModel(processDefinition);
+ long maxOID = XpdlModelUtils.getMaxUsedOid(model);
+ dataPath.setElementOid(maxOID);
dataPath.setId(getModelBuilderFacade().createIdFromName(
dataPathJson.get(ModelerConstants.NAME_PROPERTY).getAsString()));
@@ -902,7 +905,6 @@ public abstract class ModelElementUnmarshaller implements ModelUnmarshaller
String dataFullId = dataPathJson.get(
ModelerConstants.DATA_FULL_ID_PROPERTY).getAsString();
- ModelType model = ModelUtils.findContainingModel(processDefinition);
DataType data = getModelBuilderFacade().importData(model, dataFullId);
dataPath.setData(data);