| author | Sidharth Singh | 2012-08-20 10:23:42 (EDT) |
|---|---|---|
| committer | Manik Kishore | 2012-08-20 10:23:42 (EDT) |
| commit | 65ea3fa3559899b702c06e7524240988126c23ba (patch) (side-by-side diff) | |
| tree | ce34ed187c1c6dcdb4fd6340f9969e640eab8587 | |
| parent | c8c3b90e7f202e2a192097807bae82e10133e1c1 (diff) | |
| download | org.eclipse.stardust.ui.web-65ea3fa3559899b702c06e7524240988126c23ba.zip org.eclipse.stardust.ui.web-65ea3fa3559899b702c06e7524240988126c23ba.tar.gz org.eclipse.stardust.ui.web-65ea3fa3559899b702c06e7524240988126c23ba.tar.bz2 | |
Jira-ID: CRNT-25740
Added check for MODEL_ELEMENT_PROPERTY in connectionJson in toProcessDefinitionDiagram() of ModelElementMarshaller.java
git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@58558 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
| -rw-r--r-- | web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/marshaling/ModelElementMarshaller.java | 11 |
1 files changed, 7 insertions, 4 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 d828e0c..461e5c9 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 @@ -419,10 +419,13 @@ public abstract class ModelElementMarshaller for (TransitionConnectionType transitionConnection : poolSymbol.getTransitionConnection()) { JsonObject connectionJson = toTransitionConnectionJson(transitionConnection); - connectionsJson.add( - extractString( - connectionJson.getAsJsonObject(ModelerConstants.MODEL_ELEMENT_PROPERTY), - ModelerConstants.ID_PROPERTY), connectionJson); + if (connectionJson.has(ModelerConstants.MODEL_ELEMENT_PROPERTY)) + { + connectionsJson.add( + extractString( + connectionJson.getAsJsonObject(ModelerConstants.MODEL_ELEMENT_PROPERTY), + ModelerConstants.ID_PROPERTY), connectionJson); + } } } |