1 files changed, 7 insertions, 6 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOverrideRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOverrideRelationship.java
index c893406576..4087478b47 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOverrideRelationship.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOverrideRelationship.java
@@ -288,7 +288,11 @@ public class GenericOrmOverrideRelationship
 	@Override
 	public void validate(List<IMessage> messages, IReporter reporter) {
 		super.validate(messages, reporter);
-		this.strategy.validate(messages, reporter);
+		// prevent NPE on JPA 2_0 platforms
+		// this.strategy == null when the mapping relationship strategy, e.g. mapped-by, cannot be overridden
+		if (this.strategy != null) {
+			this.strategy.validate(messages, reporter);
+		}
 	}
 
 	public JptValidator buildJoinTableValidator(ReadOnlyJoinTable table) {
@@ -311,10 +315,7 @@ public class GenericOrmOverrideRelationship
 		if (result != null) {
 			return result;
 		}
-		result = this.strategy.getCompletionProposals(pos);
-		if (result != null) {
-			return result;
-		}
-		return null;
+
+		return this.strategy == null ? null : this.strategy.getCompletionProposals(pos);
 	}
 }