From: <one...@us...> - 2003-01-13 13:05:48
|
Update of /cvsroot/hibernate/Hibernate/cirrus/hibernate/proxy In directory sc8-pr-cvs1:/tmp/cvs-serv11899/hibernate/proxy Modified Files: SerializableProxy.java Log Message: fixed bug finding properties inherited by interfaces added ScrollableResults.isFirst(), isLast() Index: SerializableProxy.java =================================================================== RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/proxy/SerializableProxy.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SerializableProxy.java 26 Nov 2002 03:35:44 -0000 1.3 --- SerializableProxy.java 13 Jan 2003 13:05:45 -0000 1.4 *************** *** 7,12 **** import org.apache.commons.logging.LogFactory; - import cirrus.hibernate.helpers.ReflectHelper; - /** * Serializable placeholder for <tt>CGLIB</tt> proxies --- 7,10 ---- *************** *** 14,17 **** --- 12,21 ---- public final class SerializableProxy implements Serializable { + private Class persistentClass; + private Class[] interfaces; + private Serializable id; + private String getIdentifierMethodName; + private Class getIdentifierMethodClass; + public SerializableProxy() {} *************** *** 20,31 **** this.interfaces = interfaces; this.id = id; ! this.getIdentifierMethod = (getIdentifierMethod==null) ? null : getIdentifierMethod.getName(); } - private Class persistentClass; - private Class[] interfaces; - private Serializable id; - private String getIdentifierMethod; - Object readResolve() { try { --- 24,33 ---- this.interfaces = interfaces; this.id = id; ! if (getIdentifierMethod!=null) { ! getIdentifierMethodName = getIdentifierMethod.getName(); ! getIdentifierMethodClass = getIdentifierMethod.getDeclaringClass(); ! } } Object readResolve() { try { *************** *** 33,37 **** persistentClass, interfaces, ! (getIdentifierMethod==null) ? null : ReflectHelper.getMethod(persistentClass, getIdentifierMethod), id, null --- 35,39 ---- persistentClass, interfaces, ! (getIdentifierMethodName==null) ? null : getIdentifierMethodClass.getDeclaredMethod(getIdentifierMethodName, null), id, null |