Return-Path: Delivered-To: apmail-openjpa-commits-archive@www.apache.org Received: (qmail 99095 invoked from network); 11 Jun 2008 23:59:48 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 11 Jun 2008 23:59:48 -0000 Received: (qmail 52035 invoked by uid 500); 11 Jun 2008 23:59:39 -0000 Delivered-To: apmail-openjpa-commits-archive@openjpa.apache.org Received: (qmail 52022 invoked by uid 500); 11 Jun 2008 23:59:39 -0000 Mailing-List: contact commits-help@openjpa.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openjpa.apache.org Delivered-To: mailing list commits@openjpa.apache.org Received: (qmail 51997 invoked by uid 99); 11 Jun 2008 23:59:39 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Jun 2008 16:59:39 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Jun 2008 23:58:57 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 92ADA238896F; Wed, 11 Jun 2008 16:59:15 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@openjpa.apache.org From: pcl@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080611235915.92ADA238896F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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;