[Hibernate-commits] Hibernate2/src/net/sf/hibernate Query.java,1.10,1.11 Session.java,1.11,1.12

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate
In directory sc8-pr-cvs1:/tmp/cvs-serv27048/sf/hibernate

Modified Files:
	Query.java Session.java 
Log Message:
improved handing of proxies in QueryImpl
don't initialize proxies in update() or saveOrUpdate()
added Session.refresh(Object, LockMode)

Index: Query.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/Query.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Query.java	12 Mar 2003 12:28:58 -0000	1.10
--- Query.java	13 Mar 2003 03:15:59 -0000	1.11
***************
*** 253,257 ****
  	 * @param val a non-null instance of a persistent class
  	 */
! 	public Query setEntity(int position, Object val) throws HibernateException; // use setParameter for null values
  	/**
  	 * Bind an instance of a persistent enumeration class to a JDBC-style query parameter.
--- 253,257 ----
  	 * @param val a non-null instance of a persistent class
  	 */
! 	public Query setEntity(int position, Object val); // use setParameter for null values
  	/**
  	 * Bind an instance of a persistent enumeration class to a JDBC-style query parameter.
***************
*** 267,271 ****
  	 * @param val a non-null instance of a persistent class
  	 */
! 	public Query setEntity(String name, Object val) throws HibernateException; // use setParameter for null values
  	/**
  	 * Bind an instance of a mapped persistent enumeration class to a named query parameter.
--- 267,271 ----
  	 * @param val a non-null instance of a persistent class
  	 */
! 	public Query setEntity(String name, Object val); // use setParameter for null values
  	/**
  	 * Bind an instance of a mapped persistent enumeration class to a named query parameter.

Index: Session.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/Session.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Session.java	9 Mar 2003 04:04:05 -0000	1.11
--- Session.java	13 Mar 2003 03:16:00 -0000	1.12
***************
*** 445,448 ****
--- 445,460 ----
  	
  	/**
+ 	 * Re-read the state of the given instance from the underlying database, with
+ 	 * the given <tt>LockMode</tt>. It is inadvisable to use this to implement 
+ 	 * long-running sessions that span many business tasks. This method is, however, 
+ 	 * useful in certain special circumstances.
+ 	 *
+ 	 * @param object a persistent instance
+ 	 * @param lockMode the lock mode to use
+ 	 * @throws HibernateException
+ 	 */
+ 	public void refresh(Object object, LockMode lockMode) throws HibernateException;
+ 	
+ 	/**
  	 * Determine the current lock mode of the given object
  	 *