summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2012-12-03 05:22:43 (EST)
committerStephan Born2012-12-03 05:22:43 (EST)
commit0f8774336477bb31fed983d1f58cb39cd5e8d664 (patch)
tree58cc7118fb8796110ac128e55cd61eb5334b3bd0
parentd119a80b4f7f35dd0aefd9980a841ff791d82303 (diff)
downloadorg.eclipse.stardust.ui.web-0f8774336477bb31fed983d1f58cb39cd5e8d664.zip
org.eclipse.stardust.ui.web-0f8774336477bb31fed983d1f58cb39cd5e8d664.tar.gz
org.eclipse.stardust.ui.web-0f8774336477bb31fed983d1f58cb39cd5e8d664.tar.bz2
CRNT-27028
Added a Null check for participantFullId in updateTrigger in ModelElementUnmarshaller.java. git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@61306 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/marshaling/ModelElementUnmarshaller.java21
1 files changed, 12 insertions, 9 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 8d514c6..5ce7451 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
@@ -667,7 +667,7 @@ public abstract class ModelElementUnmarshaller implements ModelUnmarshaller
* @param json
*/
private void updateSwimlane(LaneSymbol swimlaneSymbol, JsonObject swimlaneSymbolJson)
- {
+ {
updateIdentifiableElement(swimlaneSymbol, swimlaneSymbolJson);
// update orientation
@@ -699,10 +699,10 @@ public abstract class ModelElementUnmarshaller implements ModelUnmarshaller
String participantModelID = getModelBuilderFacade().getModelId(participantFullId);
ModelType participantModel = getModelBuilderFacade().findModel(participantModelID);
String participantId = getModelBuilderFacade().stripFullId(participantFullId);
-
+
IModelParticipant findParticipant = getModelBuilderFacade().findParticipant(participantModel,
participantId);
-
+
if (!participantModelID.equals(model.getId()))
{
String fileConnectionId = WebModelerConnectionManager.createFileConnection(model,
@@ -724,7 +724,7 @@ public abstract class ModelElementUnmarshaller implements ModelUnmarshaller
PepperIconFactory iconFactory = new PepperIconFactory();
descriptor.importElements(iconFactory, model, true);
findParticipant = getModelBuilderFacade().findParticipant(model, participantId);
- }
+ }
LaneParticipantUtil.setParticipant(swimlaneSymbol, findParticipant);
}
@@ -1399,12 +1399,15 @@ public abstract class ModelElementUnmarshaller implements ModelUnmarshaller
String participantFullId = extractString(triggerJson,
ModelerConstants.PARTICIPANT_FULL_ID);
- IModelParticipant performer = getModelBuilderFacade().findParticipant(
- participantFullId);
+ if (participantFullId != null)
+ {
+ IModelParticipant performer = getModelBuilderFacade().findParticipant(
+ participantFullId);
+
+ getModelBuilderFacade().setAttribute(trigger,
+ PredefinedConstants.MANUAL_TRIGGER_PARTICIPANT_ATT, performer.getId());
+ }
- getModelBuilderFacade().setAttribute(trigger,
- PredefinedConstants.MANUAL_TRIGGER_PARTICIPANT_ATT,
- performer.getId());
}
if (triggerJson.has(ModelerConstants.PARAMETER_MAPPINGS_PROPERTY))