summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaren Butzke2012-09-12 10:37:27 (EDT)
committerKaren Butzke2012-09-12 10:41:24 (EDT)
commit9a9f815cab1b04239b6c4145c43d869a7bddf32a (patch)
tree8fd4cac600388d3502edc93296640b4d7db613e5
parent644a287232e5da457a765525304da3d2744ad491 (diff)
downloadwebtools.dali-9a9f815cab1b04239b6c4145c43d869a7bddf32a.zip
webtools.dali-9a9f815cab1b04239b6c4145c43d869a7bddf32a.tar.gz
webtools.dali-9a9f815cab1b04239b6c4145c43d869a7bddf32a.tar.bz2
Added null check before attempting to remove JoinTable annotation
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJoinTableRelationshipStrategy.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJoinTableRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJoinTableRelationshipStrategy.java
index 536a6ad..a99c56b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJoinTableRelationshipStrategy.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJoinTableRelationshipStrategy.java
@@ -160,7 +160,9 @@ public abstract class AbstractJavaJoinTableRelationshipStrategy
public void removeStrategy() {
if (this.joinTable != null) {
- this.removeJoinTableAnnotation();
+ if (this.getJoinTableAnnotation() != null) {
+ this.removeJoinTableAnnotation();
+ }
this.setJoinTable(null);
}
}