[Hibernate-commits] Hibernate Code SVN: r10186 - branches/Branch_3_2/Hibernate3/src/org/hibernate/event/def

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

Author: epbernard
Date: 2006-08-01 19:27:28 -0400 (Tue, 01 Aug 2006)
New Revision: 10186

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

Modified: branches/Branch_3_2/Hibernate3/src/org/hibernate/event/def/DefaultMergeEventListener.java
===================================================================
--- branches/Branch_3_2/Hibernate3/src/org/hibernate/event/def/DefaultMergeEventListener.java	2006-08-01 23:22:23 UTC (rev 10185)
+++ branches/Branch_3_2/Hibernate3/src/org/hibernate/event/def/DefaultMergeEventListener.java	2006-08-01 23:27:28 UTC (rev 10186)
@@ -297,7 +297,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()