You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2007/09/02 13:04:07 UTC
svn commit: r571952 -
/cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/conf/EntityMapDefaultsProcessor.java
Author: aadamchik
Date: Sun Sep 2 04:04:06 2007
New Revision: 571952
URL: http://svn.apache.org/viewvc?rev=571952&view=rev
Log:
fixing npe
Modified:
cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/conf/EntityMapDefaultsProcessor.java
Modified: cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/conf/EntityMapDefaultsProcessor.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/conf/EntityMapDefaultsProcessor.java?rev=571952&r1=571951&r2=571952&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/conf/EntityMapDefaultsProcessor.java (original)
+++ cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/conf/EntityMapDefaultsProcessor.java Sun Sep 2 04:04:06 2007
@@ -126,7 +126,8 @@
JpaTable table = new JpaTable(AnnotationPrototypes.getTable());
// unclear whether we need to apply any other name transformations ...
- // or even if we need to uppercase the name. Per default examples looks
+ // or even if we need to uppercase the name. Per default examples
+ // looks
// like we need. table.setName(entity.getName().toUpperCase());
table.setName(entity.getName());
entity.setTable(table);
@@ -207,7 +208,8 @@
jpaBasic.setColumn(column);
}
- JpaEntity entity = (JpaEntity) path.firstInstanceOf(JpaEntity.class);
+ JpaAbstractEntity entity = (JpaAbstractEntity) path
+ .firstInstanceOf(JpaAbstractEntity.class);
// process temporal type defaults
if (jpaBasic.getTemporal() == null && jpaBasic.getEnumerated() == null) {
@@ -282,7 +284,11 @@
if (column.getTable() == null) {
JpaEntity entity = (JpaEntity) path.firstInstanceOf(JpaEntity.class);
- column.setTable(entity.getTable().getName());
+
+ // parent can be a mapped superclass
+ if (entity != null) {
+ column.setTable(entity.getTable().getName());
+ }
}
if (parent.getPropertyDescriptor().isStringType()) {