summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2012-09-06 11:03:04 (EDT)
committer Stephan Born2012-09-06 11:03:04 (EDT)
commit192bc9dae19620b4b6f5e55d961b8d39fd6fa0dc (patch)
tree6df79a132a7c4d7491003755e0cfd1e20e6cd399
parentf01a3179558aad552216b9ed7fe79dd080284cb2 (diff)
downloadorg.eclipse.stardust.ui.web-192bc9dae19620b4b6f5e55d961b8d39fd6fa0dc.zip
org.eclipse.stardust.ui.web-192bc9dae19620b4b6f5e55d961b8d39fd6fa0dc.tar.gz
org.eclipse.stardust.ui.web-192bc9dae19620b4b6f5e55d961b8d39fd6fa0dc.tar.bz2
CRNT-26071
1)Added NullPointer check in toTransitionJson in ModelElementMarshaller.java git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@58986 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/marshaling/ModelElementMarshaller.java7
1 files changed, 5 insertions, 2 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 19cc9d4..0ab805b 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
@@ -1426,8 +1426,11 @@ public abstract class ModelElementMarshaller
if (null != transition.getCondition()
&& transition.getCondition().equals("CONDITION"))
{
- controlFlowJson.addProperty(ModelerConstants.CONDITION_EXPRESSION_PROPERTY,
- (String) transition.getExpression().getMixed().getValue(0));
+ if (null != transition.getExpression())
+ {
+ controlFlowJson.addProperty(ModelerConstants.CONDITION_EXPRESSION_PROPERTY,
+ (String) transition.getExpression().getMixed().getValue(0));
+ }
controlFlowJson.addProperty(ModelerConstants.OTHERWISE_PROPERTY, false);
}
else