summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaren Butzke2012-12-06 08:16:29 (EST)
committerKaren Butzke2012-12-06 08:16:29 (EST)
commite0ad5780e0bc6df6c512c7ca815a7fbb1a0edda6 (patch)
treec6f5b32bb119a45d78f3814c7ebe80f098c44e2b
parent26fd634bc1a12242a65e872a5b5fa5c0248b4027 (diff)
downloadwebtools.dali-e0ad5780e0bc6df6c512c7ca815a7fbb1a0edda6.zip
webtools.dali-e0ad5780e0bc6df6c512c7ca815a7fbb1a0edda6.tar.gz
webtools.dali-e0ad5780e0bc6df6c512c7ca815a7fbb1a0edda6.tar.bz2
ugh, broke tests with that last commit, forgot a null checkv201212061358
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericClassRef.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/jpa1/context/persistence/GenericClassRef.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericClassRef.java
index 55600dd..4e963aa 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericClassRef.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericClassRef.java
@@ -93,7 +93,7 @@ public class GenericClassRef
protected void initializeJavaPersistentType(JavaResourceAbstractType resourceType) {
this.resourceType = resourceType;
- if (this.resourceType.getKind() == Kind.TYPE) {
+ if (this.resourceType != null && this.resourceType.getKind() == Kind.TYPE) {
this.javaPersistentType = this.buildJavaPersistentType((JavaResourceType) this.resourceType);
}
}