diff options
| author | Henrik Rentz-Reichert | 2012-07-12 15:12:47 +0000 |
|---|---|---|
| committer | Henrik Rentz-Reichert | 2012-07-12 15:12:47 +0000 |
| commit | ec99fe11b8395e4febb7c572e36428dcd6d9a69a (patch) | |
| tree | 50aed4f5a6fea8137ce4afd6f5d902f10db24b34 /plugins/org.eclipse.etrice.core.genmodel | |
| parent | 0c37e999cd298576530690a08d52f5d08b78d1cc (diff) | |
| download | org.eclipse.etrice-ec99fe11b8395e4febb7c572e36428dcd6d9a69a.tar.gz org.eclipse.etrice-ec99fe11b8395e4febb7c572e36428dcd6d9a69a.tar.xz org.eclipse.etrice-ec99fe11b8395e4febb7c572e36428dcd6d9a69a.zip | |
[core.genmodel] null check for transition chains
Diffstat (limited to 'plugins/org.eclipse.etrice.core.genmodel')
| -rw-r--r-- | plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ExpandedActorClassImpl.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ExpandedActorClassImpl.java b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ExpandedActorClassImpl.java index f1c9f666a..afafbe5da 100644 --- a/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ExpandedActorClassImpl.java +++ b/plugins/org.eclipse.etrice.core.genmodel/src/org/eclipse/etrice/core/genmodel/etricegen/impl/ExpandedActorClassImpl.java @@ -1136,8 +1136,11 @@ public class ExpandedActorClassImpl extends EObjectImpl implements ExpandedActor * @generated NOT
*/
public TransitionChain getChain(Transition trans) {
+ if (trans==null)
+ return null;
+
TransitionChainBundle tcb = trans2chainBundle.get(trans);
- if (tcb.chains.isEmpty())
+ if (tcb==null || tcb.chains.isEmpty())
return null;
return tcb.chains.get(0);
@@ -1149,8 +1152,11 @@ public class ExpandedActorClassImpl extends EObjectImpl implements ExpandedActor * @generated NOT
*/
public VarDecl getData(Transition trans) {
+ if (trans==null)
+ return null;
+
TransitionChainBundle tcb = trans2chainBundle.get(trans);
- if (tcb.chains.isEmpty())
+ if (tcb==null || tcb.chains.isEmpty())
return null;
if (tcb.chains.size()==1)
|