From: <one...@us...> - 2003-01-22 13:09:22
|
Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/mapping In directory sc8-pr-cvs1:/tmp/cvs-serv17676/sf/hibernate/mapping Modified Files: RootClass.java Log Message: fixed a problem with unsaved-value attribute not being recognized for composite-id added Interceptor.isUnsaved() made save() aware of proxies Index: RootClass.java =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/mapping/RootClass.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** RootClass.java 19 Jan 2003 11:47:07 -0000 1.6 --- RootClass.java 22 Jan 2003 13:09:19 -0000 1.7 *************** *** 140,144 **** identifier = new Value(subnode, false, table, root, DEFAULT_IDENTIFIER_COLUMN_NAME); if (identifier.getType()==null) throw new MappingException( "must specify an identifier type: " + getPersistentClass().getName() ); - identifier.makeIdentifier(subnode, root); identifierProperty = null; } --- 140,143 ---- *************** *** 146,150 **** identifier = new Value(subnode, false, table, root, propertyName); identifier.setTypeByReflection( getPersistentClass(), propertyName ); - identifier.makeIdentifier(subnode, root); identifierProperty = new Property(subnode, identifier, root); } --- 145,148 ---- *************** *** 152,155 **** --- 150,154 ---- "illegal use of an array as an identifier (arrays don't reimplement equals)" ); + identifier.makeIdentifier(subnode, root); } else if ( "composite-id".equals(name) ) { *************** *** 164,167 **** --- 163,167 ---- identifierProperty = new Property(subnode, identifier, root); } + identifier.makeIdentifier(subnode, root); } else if ( "version".equals(name) || "timestamp".equals(name) ) { |