[hibernate-commits] Hibernate SVN: r19304 - core/branches/Branch_3_5/annotations/src/main/java/org/hibernate/cfg.

[hibernate-commits at lists.jboss.org]

Author: stliu
Date: 2010-04-27 04:23:55 -0400 (Tue, 27 Apr 2010)
New Revision: 19304

Modified:
   core/branches/Branch_3_5/annotations/src/main/java/org/hibernate/cfg/Ejb3Column.java
Log:
HHH-4773 revert changes

Modified: core/branches/Branch_3_5/annotations/src/main/java/org/hibernate/cfg/Ejb3Column.java
===================================================================
--- core/branches/Branch_3_5/annotations/src/main/java/org/hibernate/cfg/Ejb3Column.java	2010-04-27 07:43:21 UTC (rev 19303)
+++ core/branches/Branch_3_5/annotations/src/main/java/org/hibernate/cfg/Ejb3Column.java	2010-04-27 08:23:55 UTC (rev 19304)
@@ -439,11 +439,10 @@
 					column.setPropertyName(
 							BinderHelper.getRelativePath( propertyHolder, inferredData.getPropertyName() )
 					);
-					//although in theory, null is an acceptable value in a Map key
-					//we need force this column to be not null, as it intended to be the primary key. 
-					if ( nullability != Nullability.FORCED_NULL ) {
-						column.setNullable( false );
-					}					column.setUnique( col.unique() );
+					column.setNullable(
+							col.nullable()
+					); //TODO force to not null if available? This is a (bad) user choice.
+					column.setUnique( col.unique() );
 					column.setInsertable( col.insertable() );
 					column.setUpdatable( col.updatable() );
 					column.setSecondaryTableName( tableName );