You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2008/01/31 08:13:07 UTC
svn commit: r617028 - in
/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core:
mdb/ stateful/ stateless/ transaction/
Author: dblevins
Date: Wed Jan 30 23:13:04 2008
New Revision: 617028
URL: http://svn.apache.org/viewvc?rev=617028&view=rev
Log:
implemented the logic where we log on debug for system exceptions from business methods and on error for callbacks
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MessageDrivenBeanManagedTxPolicy.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulBeanManagedTxPolicy.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessBeanManagedTxPolicy.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionPolicy.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxManditory.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxNever.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxNotSupported.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxRequired.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxRequiresNew.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxSupports.java
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MessageDrivenBeanManagedTxPolicy.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MessageDrivenBeanManagedTxPolicy.java?rev=617028&r1=617027&r2=617028&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MessageDrivenBeanManagedTxPolicy.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MessageDrivenBeanManagedTxPolicy.java Wed Jan 30 23:13:04 2008
@@ -89,7 +89,7 @@
context.currentTx = null;
}
- logSystemException(sysException);
+ logSystemException(sysException, context);
if (context.currentTx != null) markTxRollbackOnly(context.currentTx);
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulBeanManagedTxPolicy.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulBeanManagedTxPolicy.java?rev=617028&r1=617027&r2=617028&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulBeanManagedTxPolicy.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulBeanManagedTxPolicy.java Wed Jan 30 23:13:04 2008
@@ -90,7 +90,7 @@
}
public void handleSystemException(Throwable sysException, Object instance, TransactionContext context) throws ApplicationException, SystemException {
- logSystemException(sysException);
+ logSystemException(sysException, context);
if (context.currentTx != null) markTxRollbackOnly(context.currentTx);
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessBeanManagedTxPolicy.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessBeanManagedTxPolicy.java?rev=617028&r1=617027&r2=617028&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessBeanManagedTxPolicy.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessBeanManagedTxPolicy.java Wed Jan 30 23:13:04 2008
@@ -91,7 +91,7 @@
context.currentTx = null;
}
- logSystemException(sysException);
+ logSystemException(sysException, context);
if (context.currentTx != null) markTxRollbackOnly(context.currentTx);
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionPolicy.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionPolicy.java?rev=617028&r1=617027&r2=617028&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionPolicy.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionPolicy.java Wed Jan 30 23:13:04 2008
@@ -20,6 +20,7 @@
import org.apache.openejb.InvalidateReferenceException;
import org.apache.openejb.SystemException;
import org.apache.openejb.core.ThreadContext;
+import org.apache.openejb.core.Operation;
import org.apache.openejb.util.LogCategory;
import org.apache.openejb.util.Logger;
@@ -215,8 +216,13 @@
}
- protected void logSystemException(Throwable sysException) {
- logger.debug("startup.beanInstanceSystemExceptionThrown", sysException, sysException.getMessage());
+ protected void logSystemException(Throwable sysException, TransactionContext context) {
+ Operation operation = context.callContext.getCurrentOperation();
+ if (operation.isCallback()){
+ logger.error("startup.beanInstanceSystemExceptionThrown", sysException, sysException.getMessage());
+ } else {
+ logger.debug("startup.beanInstanceSystemExceptionThrown", sysException, sysException.getMessage());
+ }
}
protected void discardBeanInstance(Object instance, ThreadContext callContext) {
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxManditory.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxManditory.java?rev=617028&r1=617027&r2=617028&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxManditory.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxManditory.java Wed Jan 30 23:13:04 2008
@@ -75,7 +75,7 @@
public void handleSystemException(Throwable sysException, Object instance, TransactionContext context) throws ApplicationException, SystemException {
/* [1] Log the system exception or error *********/
- logSystemException(sysException);
+ logSystemException(sysException, context);
/* [2] Mark the transaction for rollback. ********/
markTxRollbackOnly(context.currentTx);
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxNever.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxNever.java?rev=617028&r1=617027&r2=617028&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxNever.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxNever.java Wed Jan 30 23:13:04 2008
@@ -68,7 +68,7 @@
public void handleSystemException(Throwable sysException, Object instance, TransactionContext context) throws ApplicationException, SystemException {
/* [1] Log the system exception or error *********/
- logSystemException(sysException);
+ logSystemException(sysException, context);
/* [2] Discard instance. *************************/
discardBeanInstance(instance, context.callContext);
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxNotSupported.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxNotSupported.java?rev=617028&r1=617027&r2=617028&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxNotSupported.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxNotSupported.java Wed Jan 30 23:13:04 2008
@@ -85,7 +85,7 @@
public void handleSystemException(Throwable sysException, Object instance, TransactionContext context) throws ApplicationException, SystemException {
/* [1] Log the system exception or error *********/
- logSystemException(sysException);
+ logSystemException(sysException, context);
/* [2] Discard instance. *************************/
discardBeanInstance(instance, context.callContext);
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxRequired.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxRequired.java?rev=617028&r1=617027&r2=617028&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxRequired.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxRequired.java Wed Jan 30 23:13:04 2008
@@ -92,7 +92,7 @@
public void handleSystemException(Throwable sysException, Object instance, TransactionContext context) throws ApplicationException, SystemException {
/* [1] Log the system exception or error **********/
- logSystemException(sysException);
+ logSystemException(sysException, context);
boolean runningInContainerTransaction = (!context.currentTx.equals(context.clientTx));
if (runningInContainerTransaction) {
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxRequiresNew.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxRequiresNew.java?rev=617028&r1=617027&r2=617028&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxRequiresNew.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxRequiresNew.java Wed Jan 30 23:13:04 2008
@@ -94,7 +94,7 @@
public void handleSystemException(Throwable sysException, Object instance, TransactionContext context) throws ApplicationException, SystemException {
/* [1] Log the system exception or error **********/
- logSystemException(sysException);
+ logSystemException(sysException, context);
/* [2] afterInvoke will roll back the tx */
markTxRollbackOnly(context.currentTx);
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxSupports.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxSupports.java?rev=617028&r1=617027&r2=617028&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxSupports.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxSupports.java Wed Jan 30 23:13:04 2008
@@ -72,7 +72,7 @@
if (runningInTransaction) {
/* [1] Log the system exception or error *********/
- logSystemException(sysException);
+ logSystemException(sysException, context);
/* [2] Mark the transaction for rollback. ********/
markTxRollbackOnly(context.currentTx);
@@ -85,7 +85,7 @@
} else {
/* [1] Log the system exception or error *********/
- logSystemException(sysException);
+ logSystemException(sysException, context);
/* [2] Discard instance. *************************/
discardBeanInstance(instance, context.callContext);