From a8111521915f7b77e0ec0f53d05f7ce3ea11f5dc Mon Sep 17 00:00:00 2001
From: Ed Willink
Date: Wed, 18 May 2016 14:27:41 +0100
Subject: [486722] Eliminate unnecessary non-null enforcement

---
 .../eclipse/qvtd/codegen/qvti/java/QVTiCG2JavaVisitor.java   | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/plugins/org.eclipse.qvtd.codegen/src/org/eclipse/qvtd/codegen/qvti/java/QVTiCG2JavaVisitor.java b/plugins/org.eclipse.qvtd.codegen/src/org/eclipse/qvtd/codegen/qvti/java/QVTiCG2JavaVisitor.java
index 2efaf1bf9..23abedff4 100644
--- a/plugins/org.eclipse.qvtd.codegen/src/org/eclipse/qvtd/codegen/qvti/java/QVTiCG2JavaVisitor.java
+++ b/plugins/org.eclipse.qvtd.codegen/src/org/eclipse/qvtd/codegen/qvti/java/QVTiCG2JavaVisitor.java
@@ -1702,14 +1702,20 @@ public class QVTiCG2JavaVisitor extends CG2JavaVisitor<@NonNull QVTiCodeGenerato
 		js.append(" = ");
 		Map<Property, String> oppositeProperties = getGlobalContext().getOppositeProperties();
 		if (oppositeProperties != null) {
+			boolean isRequired = cgPropertyCallExp.isRequired();
 			String cacheName = oppositeProperties.get(asProperty);
 			if (cacheName != null) {
-				js.appendClassReference(ClassUtil.class);
-				js.append(".nonNullState (");
+				if (isRequired) {
+					js.appendClassReference(ClassUtil.class);
+					js.append(".nonNullState (");
+				}
 				js.append(cacheName);
 				js.append(".get(");
 				js.appendValueName(source);
-				js.append("))");
+				js.append(")");
+				if (isRequired) {
+					js.append(")");
+				}
 			}
 			js.append(";\n");
 		}
-- 
cgit v1.2.3