summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Pielmann2013-03-07 07:30:05 (EST)
committer Sven Rottstock2013-03-11 07:26:08 (EDT)
commitd9687a362ab45799e4314da6c34d60007d5782ed (patch)
tree22faf433db97fe97c0a2e95335dca8e9d61b11ec
parent47581ef50a5fb1aa479c6bc9f92b58be9b997f33 (diff)
downloadorg.eclipse.stardust.ui.web-d9687a362ab45799e4314da6c34d60007d5782ed.zip
org.eclipse.stardust.ui.web-d9687a362ab45799e4314da6c34d60007d5782ed.tar.gz
org.eclipse.stardust.ui.web-d9687a362ab45799e4314da6c34d60007d5782ed.tar.bz2
Jira-ID: CRNT-28220 Trigger 'participant' does not update after changing role participant
git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@63566 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/marshaling/ModelElementMarshaller.java18
1 files changed, 10 insertions, 8 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 0c24682..32a58a2 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
@@ -1485,14 +1485,16 @@ public abstract class ModelElementMarshaller implements ModelMarshaller
String participantFullID = null;
try
{
- participantFullID = getModelBuilderFacade().createFullId(
- model,
- getModelBuilderFacade().findParticipant(
- model,
- getModelBuilderFacade().getAttributeValue(
- getModelBuilderFacade().getAttribute(event,
- PredefinedConstants.MANUAL_TRIGGER_PARTICIPANT_ATT))));
-
+ if (model != null)
+ {
+ participantFullID = getModelBuilderFacade().createFullId(
+ model,
+ getModelBuilderFacade().findParticipant(
+ model,
+ getModelBuilderFacade().getAttributeValue(
+ getModelBuilderFacade().getAttribute(event,
+ PredefinedConstants.MANUAL_TRIGGER_PARTICIPANT_ATT))));
+ }
}
catch (ObjectNotFoundException ex)
{