null check on relationship mapping since it can be null when in the context of an association override

1 files changed, 5 insertions, 1 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/MappingTools.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/MappingTools.java
index 9d7d02e1d5..146454083c 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/MappingTools.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/MappingTools.java
@@ -50,7 +50,11 @@ public class MappingTools {
 		if (owningTableName == null) {
 			return null;
 		}
-		Entity targetEntity = relationshipReference.getRelationshipMapping().getResolvedTargetEntity();
+		RelationshipMapping relationshipMapping = relationshipReference.getRelationshipMapping();
+		if (relationshipMapping == null) {
+			return null;
+		}
+		Entity targetEntity = relationshipMapping.getResolvedTargetEntity();
 		if (targetEntity == null) {
 			return null;
 		}