openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p..@apache.org
Subject svn commit: r666919 - in /openjpa/trunk: openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ManagedCache.java openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestMultipleInsertDeleteSameId.java
Date Wed, 11 Jun 2008 23:59:15 GMT
Author: pcl
Date: Wed Jun 11 16:59:15 2008
New Revision: 666919

URL: http://svn.apache.org/viewvc?rev=666919&view=rev
Log:
 Merge from ../branches/1.1.x. svn merge -c 656796 ../branches/1.1.x

Added:
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestMultipleInsertDeleteSameId.java
      - copied unchanged from r656796, openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestMultipleInsertDeleteSameId.java
Modified:
    openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ManagedCache.java

Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ManagedCache.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ManagedCache.java?rev=666919&r1=666918&r2=666919&view=diff
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ManagedCache.java
(original)
+++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ManagedCache.java
Wed Jun 11 16:59:15 2008
@@ -71,7 +71,7 @@
         if (sm != null) {
             // if it's a new instance, we know it's the only match, because
             // other pers instances override new instances in _cache
-            if (sm.isNew())
+            if (sm.isNew() && !sm.isDeleted())
                 return (allowNew) ? sm : null;
             if (!allowNew || !sm.isDeleted())
                 return sm;



Mime
View raw message