[hibernate-commits] Hibernate SVN: r12788 - trunk/HibernateExt/annotations/src/java/org/hibernate/cfg.
Author: epbernard
Date: 2007-07-20 16:32:29 -0400 (Fri, 20 Jul 2007)
New Revision: 12788
Modified:
trunk/HibernateExt/annotations/src/java/org/hibernate/cfg/AnnotationBinder.java
Log:
ANN-638 NPE when @Index was wrongly used
Modified: trunk/HibernateExt/annotations/src/java/org/hibernate/cfg/AnnotationBinder.java
===================================================================
---
trunk/HibernateExt/annotations/src/java/org/hibernate/cfg/AnnotationBinder.java 2007-07-20
19:22:34 UTC (rev 12787)
+++
trunk/HibernateExt/annotations/src/java/org/hibernate/cfg/AnnotationBinder.java 2007-07-20
20:32:29 UTC (rev 12788)
@@ -1642,13 +1642,16 @@
Index index = property.getAnnotation( Index.class );
if ( index != null ) {
if ( joinColumns != null ) {
+
for (Ejb3Column column : joinColumns) {
column.addIndex( index, inSecondPass );
}
}
else {
- for (Ejb3Column column : columns) {
- column.addIndex( index, inSecondPass );
+ if ( columns != null ) {
+ for (Ejb3Column column : columns) {
+ column.addIndex( index, inSecondPass );
+ }
}
}
}