Return-Path: Delivered-To: apmail-openjpa-commits-archive@www.apache.org Received: (qmail 38280 invoked from network); 11 Oct 2010 16:05:19 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 11 Oct 2010 16:05:19 -0000 Received: (qmail 10253 invoked by uid 500); 11 Oct 2010 16:05:19 -0000 Delivered-To: apmail-openjpa-commits-archive@openjpa.apache.org Received: (qmail 10199 invoked by uid 500); 11 Oct 2010 16:05:19 -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 10192 invoked by uid 99); 11 Oct 2010 16:05:19 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Oct 2010 16:05:19 +0000 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; Mon, 11 Oct 2010 16:05:18 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C829A23889DE; Mon, 11 Oct 2010 16:04:58 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1021400 - in /openjpa/trunk: openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/ Date: Mon, 11 Oct 2010 16:04:58 -0000 To: commits@openjpa.apache.org From: curtisr7@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101011160458.C829A23889DE@eris.apache.org> Author: curtisr7 Date: Mon Oct 11 16:04:58 2010 New Revision: 1021400 URL: http://svn.apache.org/viewvc?rev=1021400&view=rev Log: OPENJPA-1644: Don't clear values from a deleted instnace. Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/EDeletedState.java openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PDeletedState.java openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewDeletedState.java openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewFlushedDeletedState.java openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestTransition2.java Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/EDeletedState.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/EDeletedState.java?rev=1021400&r1=1021399&r2=1021400&view=diff ============================================================================== --- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/EDeletedState.java (original) +++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/EDeletedState.java Mon Oct 11 16:04:58 2010 @@ -30,12 +30,10 @@ class EDeletedState extends PCState { PCState commit(StateManagerImpl context) { - context.clearFields(); return TRANSIENT; } PCState commitRetain(StateManagerImpl context) { - context.clearFields(); return TRANSIENT; } Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PDeletedState.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PDeletedState.java?rev=1021400&r1=1021399&r2=1021400&view=diff ============================================================================== --- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PDeletedState.java (original) +++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PDeletedState.java Mon Oct 11 16:04:58 2010 @@ -38,12 +38,10 @@ class PDeletedState } PCState commit(StateManagerImpl context) { - context.clearFields(); return TRANSIENT; } PCState commitRetain(StateManagerImpl context) { - context.clearFields(); return TRANSIENT; } Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewDeletedState.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewDeletedState.java?rev=1021400&r1=1021399&r2=1021400&view=diff ============================================================================== --- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewDeletedState.java (original) +++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewDeletedState.java Mon Oct 11 16:04:58 2010 @@ -30,12 +30,10 @@ class PNewDeletedState extends PCState { PCState commit(StateManagerImpl context) { - context.clearFields(); return TRANSIENT; } PCState commitRetain(StateManagerImpl context) { - context.clearFields(); return TRANSIENT; } Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewFlushedDeletedState.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewFlushedDeletedState.java?rev=1021400&r1=1021399&r2=1021400&view=diff ============================================================================== --- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewFlushedDeletedState.java (original) +++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNewFlushedDeletedState.java Mon Oct 11 16:04:58 2010 @@ -34,12 +34,10 @@ class PNewFlushedDeletedState } PCState commit(StateManagerImpl context) { - context.clearFields(); return TRANSIENT; } PCState commitRetain(StateManagerImpl context) { - context.clearFields(); return TRANSIENT; } Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestTransition2.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestTransition2.java?rev=1021400&r1=1021399&r2=1021400&view=diff ============================================================================== --- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestTransition2.java (original) +++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestTransition2.java Mon Oct 11 16:04:58 2010 @@ -518,10 +518,10 @@ public class TestTransition2 extends Bas // parent should be valid assertEquals("PARENT", parent.getStringField()); - // 'b' should be cleared - assertNull(b.getStringField()); - assertEquals(0, b.getIntField()); - assertNull(b.getSelfOneOne()); + // 'b' should not be cleared JPA 2.0 "3.2.3 Removal" + assertNotNull(b.getStringField()); + assertNotEquals(0, b.getIntField()); + assertNotNull(b.getSelfOneOne()); } /** @@ -643,10 +643,10 @@ public class TestTransition2 extends Bas // parent should be valid assertEquals("PARENT", parent.getStringField()); - // 'b' should be cleared - assertNull(b.getStringField()); - assertEquals(0, b.getIntField()); - assertNull(b.getSelfOneOne()); + // 'b' should not be cleared JPA 2.0 "3.2.3 Removal" + assertNotNull(b.getStringField()); + assertNotEquals(0, b.getIntField()); + assertNotNull(b.getSelfOneOne()); } /**