You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by al...@apache.org on 2009/09/23 18:14:36 UTC

svn commit: r818153 - in /openjpa/trunk: openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerRefreshException.java openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java

Author: allee8285
Date: Wed Sep 23 16:14:35 2009
New Revision: 818153

URL: http://svn.apache.org/viewvc?rev=818153&view=rev
Log:
OPENJPA-1323 Enhanced to conform to the new spec requirement.

Modified:
    openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerRefreshException.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java

Modified: openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerRefreshException.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerRefreshException.java?rev=818153&r1=818152&r2=818153&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerRefreshException.java (original)
+++ openjpa/trunk/openjpa-persistence-locking/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerRefreshException.java Wed Sep 23 16:14:35 2009
@@ -82,7 +82,7 @@
             {Act.TestEmployee, 1, Default_FirstName},
             
             {Act.RefreshWithLock, 1, LockModeType.NONE },
-            {Act.TestException, 0, TransactionRequiredException.class },
+            {Act.TestException, 0, null },
             
             {Act.RefreshWithLock, 1, LockModeType.READ },
             {Act.TestException, 0, TransactionRequiredException.class },

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java?rev=818153&r1=818152&r2=818153&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java Wed Sep 23 16:14:35 2009
@@ -752,7 +752,9 @@
         Map<String, Object> properties) {
         assertNotCloseInvoked();
         assertValidAttchedEntity(entity);
-        _broker.assertActiveTransaction();
+        if (mode != null && mode != LockModeType.NONE) {
+            _broker.assertActiveTransaction();
+        }
         _broker.assertWriteOperation();
 
         processLockProperties(pushFetchPlan(), mode, properties);