Return-Path: Delivered-To: apmail-openjpa-commits-archive@www.apache.org Received: (qmail 34418 invoked from network); 18 Sep 2007 21:48:15 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 18 Sep 2007 21:48:15 -0000 Received: (qmail 73077 invoked by uid 500); 18 Sep 2007 21:48:07 -0000 Delivered-To: apmail-openjpa-commits-archive@openjpa.apache.org Received: (qmail 73021 invoked by uid 500); 18 Sep 2007 21:48:07 -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 73012 invoked by uid 99); 18 Sep 2007 21:48:07 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Sep 2007 14:48:07 -0700 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; Tue, 18 Sep 2007 21:48:14 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id BDCFB1A983A; Tue, 18 Sep 2007 14:47:54 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r577077 - in /openjpa/branches/1.0.x/openjpa-kernel/src/main: java/org/apache/openjpa/kernel/BrokerImpl.java resources/org/apache/openjpa/kernel/localizer.properties Date: Tue, 18 Sep 2007 21:47:54 -0000 To: commits@openjpa.apache.org From: mikedd@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20070918214754.BDCFB1A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mikedd Date: Tue Sep 18 14:47:53 2007 New Revision: 577077 URL: http://svn.apache.org/viewvc?rev=577077&view=rev Log: OPENJPA-343 merging to 1.0.x. Original changes under rev 571523 Modified: openjpa/branches/1.0.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java openjpa/branches/1.0.x/openjpa-kernel/src/main/resources/org/apache/openjpa/kernel/localizer.properties Modified: openjpa/branches/1.0.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java URL: http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java?rev=577077&r1=577076&r2=577077&view=diff ============================================================================== --- openjpa/branches/1.0.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java (original) +++ openjpa/branches/1.0.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java Tue Sep 18 14:47:53 2007 @@ -1430,7 +1430,15 @@ _runtime.getTransactionManager().getTransaction(); if (trans == null) throw new InvalidStateException(_loc.get("null-trans")); - _runtime.setRollbackOnly(cause); + // ensure tran is in a valid state to accept the setRollbackOnly + int tranStatus = trans.getStatus(); + if ((tranStatus != Status.STATUS_NO_TRANSACTION) + && (tranStatus != Status.STATUS_ROLLEDBACK) + && (tranStatus != Status.STATUS_COMMITTED)) + _runtime.setRollbackOnly(cause); + else if (_log.isTraceEnabled()) + _log.trace(_loc.get("invalid-tran-status", new Integer( + tranStatus), "setRollbackOnly")); } catch (OpenJPAException ke) { throw ke; } catch (Exception e) { Modified: openjpa/branches/1.0.x/openjpa-kernel/src/main/resources/org/apache/openjpa/kernel/localizer.properties URL: http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-kernel/src/main/resources/org/apache/openjpa/kernel/localizer.properties?rev=577077&r1=577076&r2=577077&view=diff ============================================================================== --- openjpa/branches/1.0.x/openjpa-kernel/src/main/resources/org/apache/openjpa/kernel/localizer.properties (original) +++ openjpa/branches/1.0.x/openjpa-kernel/src/main/resources/org/apache/openjpa/kernel/localizer.properties Tue Sep 18 14:47:53 2007 @@ -373,3 +373,5 @@ provided via an initializer or by calling the setter method. You either need \ to remove the @GeneratedValue annotation or modify the code to remove the \ initializer processing. +invalid-tran-status: The transaction was not in a valid state ({0}) to \ +accept the "{1}" method invocation. Processing will continue. \ No newline at end of file