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 8BE71D7B0 for ; Fri, 13 Jul 2012 16:22:38 +0000 (UTC) Received: (qmail 77579 invoked by uid 500); 13 Jul 2012 16:22:38 -0000 Delivered-To: apmail-openjpa-commits-archive@openjpa.apache.org Received: (qmail 77509 invoked by uid 500); 13 Jul 2012 16:22:38 -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 77496 invoked by uid 99); 13 Jul 2012 16:22:37 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Jul 2012 16:22:37 +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; Fri, 13 Jul 2012 16:22:36 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 6B22A23889E2 for ; Fri, 13 Jul 2012 16:22:17 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1361285 - in /openjpa: branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java Date: Fri, 13 Jul 2012 16:22:17 -0000 To: commits@openjpa.apache.org From: allee8285@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120713162217.6B22A23889E2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: allee8285 Date: Fri Jul 13 16:22:16 2012 New Revision: 1361285 URL: http://svn.apache.org/viewvc?rev=1361285&view=rev Log: OPENJPA-2199 - Guard null pc value. Modified: openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java Modified: openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java?rev=1361285&r1=1361284&r2=1361285&view=diff ============================================================================== --- openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java (original) +++ openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java Fri Jul 13 16:22:16 2012 @@ -3204,11 +3204,13 @@ public class StateManagerImpl * field manager. */ void provideField(PersistenceCapable pc, FieldManager store, int field) { - FieldManager beforeFM = _fm; - _fm = store; - pc.pcProvideField(field); - // Retaining original FM because of the possibility of reentrant calls - if (beforeFM != null) _fm = beforeFM; + if (pc != null) { + FieldManager beforeFM = _fm; + _fm = store; + pc.pcProvideField(field); + // Retaining original FM because of the possibility of reentrant calls + if (beforeFM != null) _fm = beforeFM; + } } /** Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java?rev=1361285&r1=1361284&r2=1361285&view=diff ============================================================================== --- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java (original) +++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java Fri Jul 13 16:22:16 2012 @@ -3205,11 +3205,13 @@ public class StateManagerImpl * field manager. */ void provideField(PersistenceCapable pc, FieldManager store, int field) { - FieldManager beforeFM = _fm; - _fm = store; - pc.pcProvideField(field); - // Retaining original FM because of the possibility of reentrant calls - if (beforeFM != null) _fm = beforeFM; + if (pc != null) { + FieldManager beforeFM = _fm; + _fm = store; + pc.pcProvideField(field); + // Retaining original FM because of the possibility of reentrant calls + if (beforeFM != null) _fm = beforeFM; + } } /**