[hibernate-commits] Hibernate SVN: r17810 - core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/util.

[hibernate-commits at lists.jboss.org]

Author: stliu
Date: 2009-10-20 23:19:20 -0400 (Tue, 20 Oct 2009)
New Revision: 17810

Modified:
   core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/util/DataVersionAdapter.java
Log:
JBPAPP-2892 HHH-4435 DataVersioningException when using EJB3 entities with OPTIMISTIC caching

Modified: core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/util/DataVersionAdapter.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/util/DataVersionAdapter.java	2009-10-21 02:03:44 UTC (rev 17809)
+++ core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/main/java/org/hibernate/cache/jbc2/util/DataVersionAdapter.java	2009-10-21 03:19:20 UTC (rev 17810)
@@ -116,6 +116,10 @@
             // treat as us being newer
             return (other.previousVersion != null);
         }
+        // Can't be newer than itself
+ 	 	if ( this == dataVersion ) {
+ 	 		return false;
+ 	 	}
 
         return versionComparator.compare(currentVersion, other.previousVersion) >= 1;
     }