Author: curtisr7
Date: Thu Jan 21 22:39:19 2010
New Revision: 901901
URL: http://svn.apache.org/viewvc?rev=901901&view=rev
Log:
OPENJPA-1475: Exclude calling syncVersion() if an Entity doesn't have a version
field. Patch submitted by Dianne Richards.
Modified:
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java
Modified:
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java?rev=901901&r1=901900&r2=901901&view=diff
==============================================================================
---
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java
(original)
+++
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java
Thu Jan 21 22:39:19 2010
@@ -3053,10 +3053,8 @@
// make sure version information has been set; version info must
// always be set after the first state load or set (which is why
// we do this even if no fields were loaded -- could be that this
- // method is being called after a field is set)... some instances
- // might not have version info, in which case this gets called
- // multiple times; that should be ok too
- if (_loadVersion == null) {
+ // method is being called after a field is set)
+ if (_loadVersion == null && (_meta == null ||
_meta.getVersionField() != null)) {
syncVersion(sdata);
ret = ret || _loadVersion != null;
}
