Author: mprudhom
Date: Tue Nov 28 16:28:04 2006
New Revision: 480301
URL: http://svn.apache.org/viewvc?view=rev&rev=480301
Log:
Changed syncWithManagedTransaction to return true if a transaction is already
active (rather than throwing an exception), since section 5.9.2 of the JPA spec
suggests that it should be legal to invoke EntityManager.joinTransaction()
multiple times.
Modified:
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java
Modified:
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java
URL:
http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java?view=diff&rev=480301&r1=480300&r2=480301
==============================================================================
---
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java
(original)
+++
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java
Tue Nov 28 16:28:04 2006
@@ -1351,7 +1351,7 @@
lock();
try {
if ((_flags & FLAG_ACTIVE) != 0)
- throw new InvalidStateException(_loc.get("active"));
+ return true;
if (!_managed)
throw new InvalidStateException(_loc.get("trans-not-managed"));
if (_factory.syncWithManagedTransaction(this, false)) {
