[Hibernate-commits] Hibernate Code SVN: r10185 - trunk/Hibernate3/src/org/hibernate/event/def

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

Author: epbernard
Date: 2006-08-01 19:22:23 -0400 (Tue, 01 Aug 2006)
New Revision: 10185

Modified:
   trunk/Hibernate3/src/org/hibernate/event/def/DefaultMergeEventListener.java
Log:
HHH-1958 bug introduced after bug fix. version1 same as version2 is considered a stale object

Modified: trunk/Hibernate3/src/org/hibernate/event/def/DefaultMergeEventListener.java
===================================================================
--- trunk/Hibernate3/src/org/hibernate/event/def/DefaultMergeEventListener.java	2006-08-01 09:30:14 UTC (rev 10184)
+++ trunk/Hibernate3/src/org/hibernate/event/def/DefaultMergeEventListener.java	2006-08-01 23:22:23 UTC (rev 10185)
@@ -299,7 +299,7 @@
 		// an entity to be merged during the same transaction
 		// (though during a seperate operation) in which it was
 		// originally persisted/saved
-		boolean changed = persister.getVersionType().isSame(
+		boolean changed = ! persister.getVersionType().isSame(
 				persister.getVersion( target, source.getEntityMode() ),
 				persister.getVersion( entity, source.getEntityMode() ),
 				source.getEntityMode()