summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Pielmann2012-09-17 03:31:29 (EDT)
committer Stephan Born2012-09-17 03:31:29 (EDT)
commitba4ea8f1185931579deea91116ad7fd2948bbb45 (patch)
tree56f8d02e2278c61bc6f641ad07ae64ac8c242b88
parent94d4275d71471595627b9411b696d29c7ee39ffc (diff)
downloadorg.eclipse.stardust.ui.web-ba4ea8f1185931579deea91116ad7fd2948bbb45.zip
org.eclipse.stardust.ui.web-ba4ea8f1185931579deea91116ad7fd2948bbb45.tar.gz
org.eclipse.stardust.ui.web-ba4ea8f1185931579deea91116ad7fd2948bbb45.tar.bz2
CRNT-26101 Pepper: Cross Model: Issue's when application used for cross modelling.
git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@59250 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/marshaling/ModelElementMarshaller.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/marshaling/ModelElementMarshaller.java b/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/marshaling/ModelElementMarshaller.java
index ee61652..17c63ff 100644
--- a/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/marshaling/ModelElementMarshaller.java
+++ b/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/marshaling/ModelElementMarshaller.java
@@ -632,7 +632,8 @@ public abstract class ModelElementMarshaller implements ModelMarshaller
activityJson.addProperty(ModelerConstants.SUBPROCESS_MODE_PROPERTY, ModelerConstants.ASYNC_SEPARATE_KEY);
}
}
- else if (activity.getApplication() != null)
+ else if ((activity.eContainer() != null && (!(activity.eContainer() instanceof ChangeDescription)))
+ && activity.getApplication() != null)
{
activityJson.addProperty(
ModelerConstants.APPLICATION_FULL_ID_PROPERTY,