ST6RI-850 Added further protective null pointer checks in...

- FeatureAdapter::getBoundValueResult
- TypeAdapter::addResultBinding

Author: seidewitz

org.omg.sysml/src/org/omg/sysml/adapter/FeatureAdapter.java

@@ -209,8 +209,11 @@ protected Feature getBoundValueResult() {
 			Expression value = valuation.getValue();
 			if (value != null) {
 				ElementUtil.transform(value);
-				Feature result = FeatureUtil.chainFeatures(value, value.getResult());
-				return result;
+				Feature valueResult = value.getResult();
+				if (valueResult != null) {
+					Feature result = FeatureUtil.chainFeatures(value, value.getResult());
+					return result;
+				}
 			}
 		}
 		return null;

org.omg.sysml/src/org/omg/sysml/adapter/TypeAdapter.java

@@ -478,7 +478,8 @@ public BindingConnector addBindingConnector(Feature source, Feature target) {
 
 	public BindingConnector addResultBinding(Expression sourceExpression, Feature target) {
 		ElementUtil.transform(sourceExpression);
-		return addBindingConnector(sourceExpression.getResult(), target);
+		Feature sourceResult = sourceExpression.getResult();
+		return sourceResult == null || target == null? null: addBindingConnector(sourceResult, target);
 	}
 
 	public void createResultConnector(Feature result) {