| commit | de0c08b0b407623355c795ee7ebf3c18eb5f2614 | [log] [tgz] |
|---|---|---|
| author | Ed Willink <ed@willink.me.uk> | Fri Oct 21 15:38:29 2016 +0100 |
| committer | Ed Willink <ed@willink.me.uk> | Fri Oct 21 15:38:29 2016 +0100 |
| tree | 1db1f1ae3b06026c14cfd31e7dbda3274f7a4730 | |
| parent | e4162b12db6bbfd4d2e0c535f61efecd817a4412 [diff] |
[506228] Avoid NPE if ambiguous source has no properties
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/as2cs/EssentialOCLDeclarationVisitor.java b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/as2cs/EssentialOCLDeclarationVisitor.java index a4ccea2..1d7777e 100644 --- a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/as2cs/EssentialOCLDeclarationVisitor.java +++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/as2cs/EssentialOCLDeclarationVisitor.java
@@ -562,7 +562,7 @@ if (type != null) { CompleteClassInternal completeClass = context.getMetamodelManager().getCompleteClass(type); Iterable<@NonNull Property> properties = completeClass.getProperties(name); - if (Iterables.size(properties) > 1) { + if ((properties != null) && Iterables.size(properties) > 1) { NameExpCS csOppositeNameExp = createNameExpCS(asOpposite, null); SquareBracketedClauseCS csSquareBracketedClause = createSquareBracketedClauseCS(csOppositeNameExp); csNameExp.getOwnedSquareBracketedClauses().add(csSquareBracketedClause);