Author: pcl
Date: Wed Jun 11 17:02:34 2008
New Revision: 666923
URL: http://svn.apache.org/viewvc?rev=666923&view=rev
Log:
Merge from ../branches/1.1.x. svn merge -c 661090 ../branches/1.1.x
Modified:
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/AbstractVersionStrategy.java
Modified:
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/AbstractVersionStrategy.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/AbstractVersionStrategy.java?rev=666923&r1=666922&r2=666923&view=diff
==============================================================================
---
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/AbstractVersionStrategy.java
(original)
+++
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/AbstractVersionStrategy.java
Wed Jun 11 17:02:34 2008
@@ -63,7 +63,7 @@
public boolean checkVersion(OpenJPAStateManager sm, JDBCStore store,
boolean updateVersion)
throws SQLException {
- return false;
+ return !updateVersion;
}
public int compareVersion(Object v1, Object v2) {
