From: <one...@us...> - 2003-04-06 10:11:44
|
Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/proxy In directory sc8-pr-cvs1:/tmp/cvs-serv26833/proxy Modified Files: LazyInitializer.java Log Message: * reworked CompositeUserType * improved some exception handling Index: LazyInitializer.java =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/proxy/LazyInitializer.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** LazyInitializer.java 5 Apr 2003 07:48:45 -0000 1.7 --- LazyInitializer.java 6 Apr 2003 10:11:10 -0000 1.8 *************** *** 86,90 **** } ! else if ( !overridesEquals && "hashCode".equals(methodName) ) { // kinda dodgy, since it redefines the hashcode of the proxied object. // but necessary if we are to keep proxies in HashSets without --- 86,90 ---- } ! else if ( !overridesEquals && getIdentifierMethod!=null && "hashCode".equals(methodName) ) { // kinda dodgy, since it redefines the hashcode of the proxied object. // but necessary if we are to keep proxies in HashSets without *************** *** 100,104 **** } ! else if ( params==1 && !overridesEquals && "equals".equals(methodName) ) { // less dodgy because Hibernate forces == to be same as identifier equals return new Boolean( id.equals( getIdentifierMethod.invoke( args[0], null ) ) ); --- 100,104 ---- } ! else if ( params==1 && !overridesEquals && getIdentifierMethod!=null && "equals".equals(methodName) ) { // less dodgy because Hibernate forces == to be same as identifier equals return new Boolean( id.equals( getIdentifierMethod.invoke( args[0], null ) ) ); |