|
From: <hib...@li...> - 2006-06-09 01:25:59
|
Author: epbernard
Date: 2006-06-08 21:25:55 -0400 (Thu, 08 Jun 2006)
New Revision: 10002
Modified:
trunk/HibernateExt/metadata/src/java/org/hibernate/reflection/java/EJB3OverridenAnnotationReader.java
Log:
fix NPE
Modified: trunk/HibernateExt/metadata/src/java/org/hibernate/reflection/java/EJB3OverridenAnnotationReader.java
===================================================================
--- trunk/HibernateExt/metadata/src/java/org/hibernate/reflection/java/EJB3OverridenAnnotationReader.java 2006-06-08 21:08:04 UTC (rev 10001)
+++ trunk/HibernateExt/metadata/src/java/org/hibernate/reflection/java/EJB3OverridenAnnotationReader.java 2006-06-09 01:25:55 UTC (rev 10002)
@@ -964,8 +964,9 @@
&& ( super.isAnnotationPresent( Id.class ) || super.isAnnotationPresent( EmbeddedId.class ) );
//if ( properAccessOnMetadataComplete || properOverridingOnMetadataNonComplete ) {
boolean mirrorAttributeIsId = defaults.canUseJavaAnnotations() &&
- ( mirroredAttribute.isAnnotationPresent(Id.class)
- || mirroredAttribute.isAnnotationPresent( EmbeddedId.class ) );
+ ( mirroredAttribute != null &&
+ ( mirroredAttribute.isAnnotationPresent(Id.class)
+ || mirroredAttribute.isAnnotationPresent( EmbeddedId.class ) ) );
boolean propertyIsDefault = PropertyType.PROPERTY.equals( propertyType )
&& ! mirrorAttributeIsId;
return correctAccess || ( ! isExplicit && hasId ) || ( ! isExplicit && propertyIsDefault );
|