Return-Path: Delivered-To: apmail-cayenne-commits-archive@www.apache.org Received: (qmail 17931 invoked from network); 16 Dec 2007 23:55:49 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 16 Dec 2007 23:55:49 -0000 Received: (qmail 12645 invoked by uid 500); 16 Dec 2007 23:55:38 -0000 Delivered-To: apmail-cayenne-commits-archive@cayenne.apache.org Received: (qmail 12625 invoked by uid 500); 16 Dec 2007 23:55:38 -0000 Mailing-List: contact commits-help@cayenne.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cayenne.apache.org Delivered-To: mailing list commits@cayenne.apache.org Received: (qmail 12616 invoked by uid 99); 16 Dec 2007 23:55:38 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 16 Dec 2007 15:55:38 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 16 Dec 2007 23:55:25 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 65D1B1A984E; Sun, 16 Dec 2007 15:55:27 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r604748 - /cayenne/main/branches/STABLE-1.2/cayenne/cayenne-java/src/cayenne/java/org/objectstyle/cayenne/CayenneContextGraphAction.java Date: Sun, 16 Dec 2007 23:55:27 -0000 To: commits@cayenne.apache.org From: kmenard@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071216235527.65D1B1A984E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kmenard Date: Sun Dec 16 15:55:25 2007 New Revision: 604748 URL: http://svn.apache.org/viewvc?rev=604748&view=rev Log: Backported an NPE fix. Modified: cayenne/main/branches/STABLE-1.2/cayenne/cayenne-java/src/cayenne/java/org/objectstyle/cayenne/CayenneContextGraphAction.java Modified: cayenne/main/branches/STABLE-1.2/cayenne/cayenne-java/src/cayenne/java/org/objectstyle/cayenne/CayenneContextGraphAction.java URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-1.2/cayenne/cayenne-java/src/cayenne/java/org/objectstyle/cayenne/CayenneContextGraphAction.java?rev=604748&r1=604747&r2=604748&view=diff ============================================================================== --- cayenne/main/branches/STABLE-1.2/cayenne/cayenne-java/src/cayenne/java/org/objectstyle/cayenne/CayenneContextGraphAction.java (original) +++ cayenne/main/branches/STABLE-1.2/cayenne/cayenne-java/src/cayenne/java/org/objectstyle/cayenne/CayenneContextGraphAction.java Sun Dec 16 15:55:25 2007 @@ -72,11 +72,10 @@ class CayenneContextGraphAction { CayenneContext context; - ThreadLocal arcChangeInProcess; + static final ThreadLocal arcChangeInProcess = new ThreadLocal(); CayenneContextGraphAction(CayenneContext context) { this.context = context; - this.arcChangeInProcess = new ThreadLocal(); } /**