From 65e5a34a3bf5907164ad53a31167f8fed7998545 Mon Sep 17 00:00:00 2001
From: Peter Feiler <phf@sei.cmu.edu>
Date: Tue, 11 Apr 2017 23:08:31 -0400
Subject: [PATCH] Fixes #128 outgoing propagation condition with null error
 type on right hand side is now handled correctly in contains methods.

---
 .../org/osate/xtext/aadl2/errormodel/util/EM2TypeSetUtil.java   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/org.osate.xtext.aadl2.errormodel/src/org/osate/xtext/aadl2/errormodel/util/EM2TypeSetUtil.java b/org.osate.xtext.aadl2.errormodel/src/org/osate/xtext/aadl2/errormodel/util/EM2TypeSetUtil.java
index b20a1693..7f732f8a 100644
--- a/org.osate.xtext.aadl2.errormodel/src/org/osate/xtext/aadl2/errormodel/util/EM2TypeSetUtil.java
+++ b/org.osate.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;