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 2008/08/08 22:53:27 UTC
svn commit: r684088 -
/openjpa/branches/1.2.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceExceptions.java
Author: allee8285
Date: Fri Aug 8 13:53:26 2008
New Revision: 684088
URL: http://svn.apache.org/viewvc?rev=684088&view=rev
Log:
Merge r684082 from trunk to 1.2.x branch.
Modified:
openjpa/branches/1.2.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceExceptions.java
Modified: openjpa/branches/1.2.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceExceptions.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceExceptions.java?rev=684088&r1=684087&r2=684088&view=diff
==============================================================================
--- openjpa/branches/1.2.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceExceptions.java (original)
+++ openjpa/branches/1.2.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceExceptions.java Fri Aug 8 13:53:26 2008
@@ -68,7 +68,7 @@
try {
throwing = true;
if (em.isOpen() && ((EntityManagerImpl) em).isActive())
- ((EntityManagerImpl) em).setRollbackOnly(re);
+ ((EntityManagerImpl) em).setRollbackOnly(ex);
} finally {
// handle re-entrancy
throwing = false;