[jboss-cvs] JBossAS SVN: r93485 - branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity.

[jboss-cvs-commits at lists.jboss.org]

Author: dereed
Date: 2009-09-14 12:35:27 -0400 (Mon, 14 Sep 2009)
New Revision: 93485

Modified:
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/OptimisticJBCCache.java
Log:
[JBAS-7240] Fix OPTIMISTIC version check for EJB3 entities


Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/OptimisticJBCCache.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/OptimisticJBCCache.java	2009-09-14 16:14:10 UTC (rev 93484)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/entity/OptimisticJBCCache.java	2009-09-14 16:35:27 UTC (rev 93485)
@@ -418,6 +418,11 @@
                // 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;
 		}