Apache
/
openjpa
mirror of https://github.com/apache/openjpa.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Exception translation when a managed transaction completion even causes an 

error.



git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@491994 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
A. Abram White 2007-01-03 00:48:59 +00:00
parent a255da6f65
commit 056ecf52fd
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java
View File

@ -1757,11 +1757,11 @@ public class BrokerImpl
} catch (OpenJPAException ke) { } catch (OpenJPAException ke) {
if (_log.isTraceEnabled()) if (_log.isTraceEnabled())
_log.trace(_loc.get("end-trans-error"), ke); _log.trace(_loc.get("end-trans-error"), ke);
throw ke; throw translateManagedCompletionException(ke);
} catch (RuntimeException re) { } catch (RuntimeException re) {
if (_log.isTraceEnabled()) if (_log.isTraceEnabled())
_log.trace(_loc.get("end-trans-error"), re); _log.trace(_loc.get("end-trans-error"), re);
throw new StoreException(re); throw translateManagedCompletionException(new StoreException(re));
} finally { } finally {
endOperation(); endOperation();
} }
@ -1789,11 +1789,11 @@ public class BrokerImpl
} catch (OpenJPAException ke) { } catch (OpenJPAException ke) {
if (_log.isTraceEnabled()) if (_log.isTraceEnabled())
_log.trace(_loc.get("end-trans-error"), ke); _log.trace(_loc.get("end-trans-error"), ke);
throw ke; throw translateManagedCompletionException(ke);
} catch (RuntimeException re) { } catch (RuntimeException re) {
if (_log.isTraceEnabled()) if (_log.isTraceEnabled())
_log.trace(_loc.get("end-trans-error"), re); _log.trace(_loc.get("end-trans-error"), re);
throw new StoreException(re); throw translateManagedCompletionException(new StoreException(re));
} finally { } finally {
_flags &= ~FLAG_ACTIVE; _flags &= ~FLAG_ACTIVE;
_flags &= ~FLAG_FLUSHED; _flags &= ~FLAG_FLUSHED;
@ -1813,6 +1813,15 @@ public class BrokerImpl
} }
} }
/**
* If we're in a managed transaction, use our implicit behavior exception
* translator to translate before/afterCompletion callback errors.
*/
private RuntimeException translateManagedCompletionException
(RuntimeException re) {
return (!_managed || _extrans == null) ? re : _extrans.translate(re);
}
/** /**
* Flush safely, catching reentrant calls. * Flush safely, catching reentrant calls.
*/ */

2
openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceExceptions.java
View File

@ -48,7 +48,7 @@ public class PersistenceExceptions
* and {@link NonUniqueResultException} in accordance with * and {@link NonUniqueResultException} in accordance with
* section 3.7 of the EJB 3.0 specification. * section 3.7 of the EJB 3.0 specification.
*/ */
static RuntimeExceptionTranslator getRollbackTranslator public static RuntimeExceptionTranslator getRollbackTranslator
(final OpenJPAEntityManager em) { (final OpenJPAEntityManager em) {
return new RuntimeExceptionTranslator() { return new RuntimeExceptionTranslator() {
private boolean throwing = false; private boolean throwing = false;