From commits-return-9495-apmail-openjpa-commits-archive=openjpa.apache.org@openjpa.apache.org Sun Apr 1 19:41:22 2012 Return-Path: X-Original-To: apmail-openjpa-commits-archive@www.apache.org Delivered-To: apmail-openjpa-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 21C709736 for ; Sun, 1 Apr 2012 19:41:22 +0000 (UTC) Received: (qmail 67571 invoked by uid 500); 1 Apr 2012 19:41:21 -0000 Delivered-To: apmail-openjpa-commits-archive@openjpa.apache.org Received: (qmail 67545 invoked by uid 500); 1 Apr 2012 19:41:21 -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 67538 invoked by uid 99); 1 Apr 2012 19:41:21 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Apr 2012 19:41:21 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Sun, 01 Apr 2012 19:41:20 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 7C0F723889E1 for ; Sun, 1 Apr 2012 19:41:00 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1308184 - /openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransState.java Date: Sun, 01 Apr 2012 19:41:00 -0000 To: commits@openjpa.apache.org From: curtisr7@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120401194100.7C0F723889E1@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: curtisr7 Date: Sun Apr 1 19:40:59 2012 New Revision: 1308184 URL: http://svn.apache.org/viewvc?rev=1308184&view=rev Log: OPENJPA-2151: If transitioning from PClean to PNonTransState, don't reset dirty bitset. Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransState.java Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransState.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransState.java?rev=1308184&r1=1308183&r2=1308184&view=diff ============================================================================== --- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransState.java (original) +++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PNonTransState.java Sun Apr 1 19:40:59 2012 @@ -40,12 +40,13 @@ class PNonTransState @Override void initialize(StateManagerImpl context, PCState previous) { if (previous == null) - return; - - // spec says all proxies to second class objects should be reset - context.proxyFields(true, false); - - context.setDirty(false); + return; + // If our previous state is clean, we don't need to do any sort of cleanup + if (previous != PCLEAN) { + // spec says all proxies to second class objects should be reset + context.proxyFields(true, false); + context.setDirty(false); + } context.clearSavedFields(); }