From: <epb...@us...> - 2006-02-11 02:51:10
|
Update of /cvsroot/hibernate/HibernateExt/metadata/src/java/org/hibernate/validator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11100/metadata/src/java/org/hibernate/validator Modified Files: NotNullValidator.java Log Message: ANN-146 ignore SingleTable in not null Index: NotNullValidator.java =================================================================== RCS file: /cvsroot/hibernate/HibernateExt/metadata/src/java/org/hibernate/validator/NotNullValidator.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- NotNullValidator.java 18 Sep 2005 23:26:49 -0000 1.3 +++ NotNullValidator.java 11 Feb 2006 02:50:57 -0000 1.4 @@ -6,6 +6,7 @@ import org.hibernate.mapping.Column; import org.hibernate.mapping.Property; +import org.hibernate.mapping.SingleTableSubclass; /** * Check a not null restriction on an object @@ -24,9 +25,12 @@ @SuppressWarnings("unchecked") public void apply(Property property) { - Iterator<Column> iter = (Iterator<Column>) property.getColumnIterator(); - while ( iter.hasNext() ) { - iter.next().setNullable( false ); + if ( ! ( property.getPersistentClass() instanceof SingleTableSubclass ) ) { + //single table should not be forced to null + Iterator<Column> iter = (Iterator<Column>) property.getColumnIterator(); + while ( iter.hasNext() ) { + iter.next().setNullable( false ); + } } } } |