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@61270 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b

1 files changed, 3 insertions, 4 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 8fd9741..08b6b1f 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
@@ -934,11 +934,9 @@ public abstract class ModelElementUnmarshaller implements ModelUnmarshaller
 
          for (int n = 0; n < dataPathes.size(); ++n)
          {
+            ModelType model = ModelUtils.findContainingModel(processDefinition);
             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()));
@@ -953,7 +951,8 @@ public abstract class ModelElementUnmarshaller implements ModelUnmarshaller
                      ModelerConstants.DATA_FULL_ID_PROPERTY).getAsString();
 
                DataType data = getModelBuilderFacade().importData(model, dataFullId);
-
+               long maxOID = XpdlModelUtils.getMaxUsedOid(model);
+               dataPath.setElementOid(++maxOID);
                dataPath.setData(data);
             }