Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Willink2016-05-05 18:12:11 +0000
committerEd Willink2016-05-05 18:12:11 +0000
commitc62acd46753b80087b26ff5d56f292bfff9a98df (patch)
tree2fb24fe49c06bf4add94c5b654f6e0772ca18721
parent06339afe1d23f93e1e24fa3049678aee594d3dc3 (diff)
downloadorg.eclipse.qvtd-c62acd46753b80087b26ff5d56f292bfff9a98df.tar.gz
org.eclipse.qvtd-c62acd46753b80087b26ff5d56f292bfff9a98df.tar.xz
org.eclipse.qvtd-c62acd46753b80087b26ff5d56f292bfff9a98df.zip
[481664] Fix unnecessary NPE
-rw-r--r--plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/impl/FunctionImpl.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/impl/FunctionImpl.java b/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/impl/FunctionImpl.java
index 69803a60d..30f9d8f57 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/impl/FunctionImpl.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/impl/FunctionImpl.java
@@ -215,7 +215,8 @@ public class FunctionImpl extends OperationImpl implements Function {
@Override
public Type getType() {
- return getQueryExpression().getType();
+ OCLExpression queryExpression = getQueryExpression();
+ return queryExpression != null ? queryExpression.getType() : null;
}
}

Back to the top