You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by al...@apache.org on 2008/08/08 20:34:10 UTC
svn commit: r684039 -
/openjpa/branches/1.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java
Author: allee8285
Date: Fri Aug 8 11:34:10 2008
New Revision: 684039
URL: http://svn.apache.org/viewvc?rev=684039&view=rev
Log:
OPENJPA-680 - Merge changes back to 1.2.x branch.
Modified:
openjpa/branches/1.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java
Modified: openjpa/branches/1.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java?rev=684039&r1=684038&r2=684039&view=diff
==============================================================================
--- openjpa/branches/1.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java (original)
+++ openjpa/branches/1.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java Fri Aug 8 11:34:10 2008
@@ -362,7 +362,8 @@
*/
protected boolean load(FetchConfiguration fetch, int loadMode,
BitSet exclude, Object sdata, boolean forWrite) {
- if (!forWrite && (!isPersistent() || isNew() || isDeleted()))
+ if (!forWrite
+ && (!isPersistent() || (isNew() && !isFlushed()) || isDeleted()))
return false;
// if any fields being loaded, do state transitions for read