You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by tv...@apache.org on 2018/01/18 15:46:25 UTC
[30/50] tomee git commit: addressing the logging issues. tx
SvetlinZarev
addressing the logging issues. tx SvetlinZarev
(cherry picked from commit 71cc683b4820f2eb349b6f354e805c25548ac0ab)
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/11a9390b
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/11a9390b
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/11a9390b
Branch: refs/heads/tomee-1.7.x
Commit: 11a9390b216c6b33361a1f88c211c1ee84ab3db1
Parents: 6643296
Author: Thiago Veronezi <th...@veronezi.org>
Authored: Thu Jan 4 12:16:46 2018 -0500
Committer: Thiago Veronezi <th...@veronezi.org>
Committed: Wed Jan 17 13:12:54 2018 -0500
----------------------------------------------------------------------
.../openejb/core/mdb/AbstractEndpointHandler.java | 2 --
.../apache/openejb/core/mdb/PoolEndpointHandler.java | 13 ++++---------
2 files changed, 4 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/11a9390b/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/AbstractEndpointHandler.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/AbstractEndpointHandler.java b/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/AbstractEndpointHandler.java
index 5310c44..fc2bd22 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/AbstractEndpointHandler.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/AbstractEndpointHandler.java
@@ -132,7 +132,6 @@ abstract class AbstractEndpointHandler implements InvocationHandler, MessageEndp
}
if (throwable != null) {
- throwable.printStackTrace();
if (isValidException(method, throwable)) {
throw throwable;
} else {
@@ -159,7 +158,6 @@ abstract class AbstractEndpointHandler implements InvocationHandler, MessageEndp
exceptionThrown = true;
final Throwable throwable = se.getRootCause() != null ? se.getRootCause() : se;
- throwable.printStackTrace();
throw new ApplicationServerInternalException(throwable);
} finally {
if (state == State.SYSTEM_EXCEPTION) {
http://git-wip-us.apache.org/repos/asf/tomee/blob/11a9390b/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/PoolEndpointHandler.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/PoolEndpointHandler.java b/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/PoolEndpointHandler.java
index a6d0403..99bce83 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/PoolEndpointHandler.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/PoolEndpointHandler.java
@@ -21,6 +21,8 @@ import org.apache.openejb.BeanContext;
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.SystemException;
import org.apache.openejb.core.ThreadContext;
+import org.apache.openejb.util.LogCategory;
+import org.apache.openejb.util.Logger;
import javax.resource.spi.ApplicationServerInternalException;
import javax.resource.spi.UnavailableException;
@@ -29,6 +31,7 @@ import java.lang.reflect.Method;
public class PoolEndpointHandler extends AbstractEndpointHandler {
+ private static final Logger LOGGER = Logger.getInstance(LogCategory.OPENEJB, "org.apache.openejb.util.resources");
private final BeanContext deployment;
private final MdbInstanceManager instanceManager;
@@ -89,25 +92,17 @@ public class PoolEndpointHandler extends AbstractEndpointHandler {
// call afterDelivery on the container
- boolean exceptionThrown = false;
try {
container.afterDelivery(instance);
} catch (final SystemException se) {
- exceptionThrown = true;
-
final Throwable throwable = se.getRootCause() != null ? se.getRootCause() : se;
- throwable.printStackTrace();
throw new ApplicationServerInternalException(throwable);
} finally {
- if (state == State.SYSTEM_EXCEPTION) {
-// recreateInstance(exceptionThrown);
- }
// we are now in the default NONE state
state = State.NONE;
}
}
-
@Override
public void release() {
if (state == State.RELEASED) {
@@ -122,7 +117,7 @@ public class PoolEndpointHandler extends AbstractEndpointHandler {
try {
instanceManager.poolInstance(new ThreadContext(deployment, null), instance);
} catch (OpenEJBException e) {
- e.printStackTrace();
+ LOGGER.error("Unable to add instance back to the pool", e);
}
instance = null;
}