You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@openjpa.apache.org by fa...@apache.org on 2010/07/20 19:49:25 UTC

svn commit: r965928 - /openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/TimestampVersionStrategy.java

Author: faywang
Date: Tue Jul 20 17:49:25 2010
New Revision: 965928

URL: http://svn.apache.org/viewvc?rev=965928&view=rev
Log:
OPENJPA-1726: fix intermittent failure in TestTimestampVersion. The next bulkUpdate timestamp version should be consistently generated as nextVersion method.  

Modified:
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/TimestampVersionStrategy.java

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/TimestampVersionStrategy.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/TimestampVersionStrategy.java?rev=965928&r1=965927&r2=965928&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/TimestampVersionStrategy.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/TimestampVersionStrategy.java Tue Jul 20 17:49:25 2010
@@ -52,7 +52,7 @@ public class TimestampVersionStrategy
     public Map getBulkUpdateValues() {
         Column[] cols = vers.getColumns();
         Map map = new HashMap(cols.length);
-        Date d = new Date();
+        Object d = nextVersion(null);
         for (int i = 0; i < cols.length; i++)
             map.put(cols[i], d);
         return map;