Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkmoore2007-06-06 18:40:31 +0000
committerkmoore2007-06-06 18:40:31 +0000
commitedad7694c06e1784ea8cd0b9bbc04ba7186ab468 (patch)
tree60b7ebdb24fbf889858d87153648cc412b8e5ab7
parent50b5775951d1dc25f50a8b630f11b79554544821 (diff)
downloadwebtools.dali-edad7694c06e1784ea8cd0b9bbc04ba7186ab468.tar.gz
webtools.dali-edad7694c06e1784ea8cd0b9bbc04ba7186ab468.tar.xz
webtools.dali-edad7694c06e1784ea8cd0b9bbc04ba7186ab468.zip
191264 - applied patch - NPE in orm.xml attribute override refreshDefaults
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/XmlAttributeOverrideContext.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/XmlAttributeOverrideContext.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/XmlAttributeOverrideContext.java
index e49db6c5a2..62ae331741 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/XmlAttributeOverrideContext.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/XmlAttributeOverrideContext.java
@@ -61,6 +61,9 @@ public class XmlAttributeOverrideContext extends AttributeOverrideContext
private IAttributeOverride javaAttributeOverride() {
JavaEntity javaEntity = ((XmlEntityContext) getParentContext()).getJavaEntity();
+ if (javaEntity == null) {
+ return null;
+ }
return javaEntity.attributeOverrideNamed(this.attributeOverride.getName());
}

Back to the top