summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNan Li2013-05-01 15:27:11 (EDT)
committer Neil Hauge2013-05-01 15:28:15 (EDT)
commit836173b5d12c607fd3db5999ec6cc7a3d21fa61a (patch)
treec9507631f665a6ae7a54d3ec66081c4e248c5f81
parent588e86b2e6f98cfacb75f8ee2c39260a96815c1d (diff)
downloadwebtools.dali-836173b5d12c607fd3db5999ec6cc7a3d21fa61a.zip
webtools.dali-836173b5d12c607fd3db5999ec6cc7a3d21fa61a.tar.gz
webtools.dali-836173b5d12c607fd3db5999ec6cc7a3d21fa61a.tar.bz2
397391 - fix NPE: 1-m/m-m switch joining strategy from JoinTable tov201305020316
JoinColumns or MappedBy
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJoinTableRelationshipStrategy.java2
1 files changed, 1 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 3ed65f9..948f87e 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
@@ -155,7 +155,7 @@ public abstract class AbstractJavaJoinTableRelationshipStrategy<P extends JavaJo
public void removeStrategy() {
if (this.joinTable != null) {
- if (this.getJoinTableAnnotation() != null) {
+ if (this.getJoinTableAnnotation().isSpecified()) {
this.removeJoinTableAnnotation();
}
this.setJoinTable(null);