[Hibernate-commits] Hibernate Code SVN: r9627 - in branches/Branch_3_1/Hibernate3/src/org/hibernate: engine type

[<hib...@li...>]

Author: ste...@jb...
Date: 2006-03-15 14:13:30 -0500 (Wed, 15 Mar 2006)
New Revision: 9627

Modified:
   branches/Branch_3_1/Hibernate3/src/org/hibernate/engine/TwoPhaseLoad.java
   branches/Branch_3_1/Hibernate3/src/org/hibernate/engine/Versioning.java
   branches/Branch_3_1/Hibernate3/src/org/hibernate/type/BinaryType.java
Log:
minor : logging of version values

Modified: branches/Branch_3_1/Hibernate3/src/org/hibernate/engine/TwoPhaseLoad.java
===================================================================
--- branches/Branch_3_1/Hibernate3/src/org/hibernate/engine/TwoPhaseLoad.java	2006-03-15 09:39:51 UTC (rev 9626)
+++ branches/Branch_3_1/Hibernate3/src/org/hibernate/engine/TwoPhaseLoad.java	2006-03-15 19:13:30 UTC (rev 9627)
@@ -69,7 +69,10 @@
 			);
 	
 		if ( log.isTraceEnabled() && version!=null ) {
-			log.trace( "Version: " + version );
+			String versionStr = persister.isVersioned()
+					? persister.getVersionType().toLoggableString( version, session.getFactory() )
+			        : "null";
+			log.trace( "Version: " + versionStr );
 		}
 	
 	}

Modified: branches/Branch_3_1/Hibernate3/src/org/hibernate/engine/Versioning.java
===================================================================
--- branches/Branch_3_1/Hibernate3/src/org/hibernate/engine/Versioning.java	2006-03-15 09:39:51 UTC (rev 9626)
+++ branches/Branch_3_1/Hibernate3/src/org/hibernate/engine/Versioning.java	2006-03-15 19:13:30 UTC (rev 9627)
@@ -23,7 +23,14 @@
 	 */
 	public static Object increment(Object version, VersionType versionType, SessionImplementor session) {
 		Object next = versionType.next( version, session );
-		if ( log.isTraceEnabled() ) log.trace("Incrementing: " + version + " to " + next);
+		if ( log.isTraceEnabled() ) {
+			log.trace(
+					"Incrementing: " +
+					versionType.toLoggableString( version, session.getFactory() ) +
+					" to " +
+					versionType.toLoggableString( next, session.getFactory() )
+			);
+		}
 		return next;
 	}
 

Modified: branches/Branch_3_1/Hibernate3/src/org/hibernate/type/BinaryType.java
===================================================================
--- branches/Branch_3_1/Hibernate3/src/org/hibernate/type/BinaryType.java	2006-03-15 09:39:51 UTC (rev 9626)
+++ branches/Branch_3_1/Hibernate3/src/org/hibernate/type/BinaryType.java	2006-03-15 19:13:30 UTC (rev 9627)
@@ -85,7 +85,7 @@
 	}
 
 	public Object next(Object current, SessionImplementor session) {
-		return null;
+		return current;
 	}
 
 	public Comparator getComparator() {