Fixes #128

outgoing propagation condition with null error type on right hand side is now handled correctly in contains methods.
osate · Apr 12, 2017 · 65e5a34 · 65e5a34
1 parent 5cf3789
commit 65e5a34
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/...sate.xtext.aadl2.errormodel/src/org/osate/xtext/aadl2/errormodel/util/EM2TypeSetUtil.java b/...sate.xtext.aadl2.errormodel/src/org/osate/xtext/aadl2/errormodel/util/EM2TypeSetUtil.java
@@ -177,6 +177,8 @@ public static boolean contains(ErrorTypes constraint, ErrorTypes type) {
 	 */
 	public static boolean contains(ErrorType constraint, TypeSet ts) {
 		ts = EMV2Util.resolveAlias(ts);
+		if (ts == null)
+			return true;
 		for (TypeToken tselement : ts.getTypeTokens()) {
 			if (!contains(constraint, tselement)) {
 				return false;