Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Vosburgh2013-05-20 18:47:30 +0000
committerBrian Vosburgh2013-06-13 22:06:49 +0000
commit67ed796ba03db748aaf21c4997b90bf98c97db8a (patch)
tree45af631c0882499ef41d047151549c93d8f5f55a /jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal
parent99a456e0533837b890c32d70269365b1975123ff (diff)
downloadwebtools.dali-67ed796ba03db748aaf21c4997b90bf98c97db8a.tar.gz
webtools.dali-67ed796ba03db748aaf21c4997b90bf98c97db8a.tar.xz
webtools.dali-67ed796ba03db748aaf21c4997b90bf98c97db8a.zip
copy only *specified* join table when converting an orm.xml attribute
mapping
Diffstat (limited to 'jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal')
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmJoinTableRelationshipStrategy.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/orm/AbstractOrmJoinTableRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmJoinTableRelationshipStrategy.java
index f6278bf046..688a04e2b3 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmJoinTableRelationshipStrategy.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmJoinTableRelationshipStrategy.java
@@ -152,7 +152,7 @@ public abstract class AbstractOrmJoinTableRelationshipStrategy<P extends OrmJoin
public void initializeFrom(OrmSpecifiedJoinTableRelationshipStrategy oldStrategy) {
OrmSpecifiedJoinTable oldJoinTable = oldStrategy.getJoinTable();
- if (oldJoinTable != null) {
+ if ((oldJoinTable != null) && oldJoinTable.isSpecifiedInResource()) {
this.addStrategy();
this.joinTable.initializeFrom(oldJoinTable);
}

Back to the top