removes comments code (cherry picked from commit dcf0569991ee73cd848bb7b63b531622b745a237)
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/952050ae Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/952050ae Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/952050ae Branch: refs/heads/tomee-1.7.x Commit: 952050aeeaf95ce194354e44161e592936064b4f Parents: 14b702c Author: Otavio Santana <[email protected]> Authored: Fri Dec 15 06:56:39 2017 -0300 Committer: Thiago Veronezi <[email protected]> Committed: Wed Jan 17 11:30:43 2018 -0500 ---------------------------------------------------------------------- .../openejb/core/mdb/EndpointHandler.java | 55 --------------- .../openejb/core/mdb/PoolEndpointHandler.java | 71 +------------------- 2 files changed, 1 insertion(+), 125 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/952050ae/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EndpointHandler.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EndpointHandler.java b/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EndpointHandler.java index e08fca9..bba9acb 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EndpointHandler.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EndpointHandler.java @@ -78,61 +78,6 @@ public class EndpointHandler implements InvocationHandler, MessageEndpoint { instance = instanceFactory.createInstance(false); } -// private static void logTx() { -// TransactionManager transactionManager = SystemInstance.get().getComponent(TransactionManager.class); -// Transaction transaction = null; -// String status = "ERROR"; -// try { -// transaction = transactionManager.getTransaction(); -// int txStatus; -// if (transaction != null) { -// txStatus = transaction.getStatus(); -// } else { -// txStatus = Status.STATUS_NO_TRANSACTION; -// } -// switch (txStatus) { -// case Status.STATUS_ACTIVE: -// status = "STATUS_ACTIVE"; -// break; -// case Status.STATUS_MARKED_ROLLBACK: -// status = "MARKED_ROLLBACK"; -// break; -// case Status.STATUS_PREPARED: -// status = "PREPARED"; -// break; -// case Status.STATUS_COMMITTED: -// status = "COMMITTED"; -// break; -// case Status.STATUS_ROLLEDBACK: -// status = "ROLLEDBACK"; -// break; -// case Status.STATUS_UNKNOWN: -// status = "UNKNOWN"; -// break; -// case Status.STATUS_NO_TRANSACTION: -// status = "NO_TRANSACTION"; -// break; -// case Status.STATUS_PREPARING: -// status = "PREPARING"; -// break; -// case Status.STATUS_COMMITTING: -// status = "COMMITTING"; -// break; -// case Status.STATUS_ROLLING_BACK: -// status = "ROLLING_BACK"; -// break; -// default: -// status = "UNKNOWN " + txStatus; -// } -// } catch (javax.transaction.SystemException e) { -// } -// System.out.println("\n" + -// "***************************************\n" + -// "transaction " + transaction + "\n" + -// " status " + status + "\n" + -// "***************************************\n\n"); -// -// } public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable { // System.out.println("\n" + http://git-wip-us.apache.org/repos/asf/tomee/blob/952050ae/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 9f9f5b7..6e9d9a7 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 @@ -85,62 +85,6 @@ public class PoolEndpointHandler implements InvocationHandler, MessageEndpoint { this.callContext = ThreadContext.getThreadContext(); } -// private static void logTx() { -// TransactionManager transactionManager = SystemInstance.get().getComponent(TransactionManager.class); -// Transaction transaction = null; -// String status = "ERROR"; -// try { -// transaction = transactionManager.getTransaction(); -// int txStatus; -// if (transaction != null) { -// txStatus = transaction.getStatus(); -// } else { -// txStatus = Status.STATUS_NO_TRANSACTION; -// } -// switch (txStatus) { -// case Status.STATUS_ACTIVE: -// status = "STATUS_ACTIVE"; -// break; -// case Status.STATUS_MARKED_ROLLBACK: -// status = "MARKED_ROLLBACK"; -// break; -// case Status.STATUS_PREPARED: -// status = "PREPARED"; -// break; -// case Status.STATUS_COMMITTED: -// status = "COMMITTED"; -// break; -// case Status.STATUS_ROLLEDBACK: -// status = "ROLLEDBACK"; -// break; -// case Status.STATUS_UNKNOWN: -// status = "UNKNOWN"; -// break; -// case Status.STATUS_NO_TRANSACTION: -// status = "NO_TRANSACTION"; -// break; -// case Status.STATUS_PREPARING: -// status = "PREPARING"; -// break; -// case Status.STATUS_COMMITTING: -// status = "COMMITTING"; -// break; -// case Status.STATUS_ROLLING_BACK: -// status = "ROLLING_BACK"; -// break; -// default: -// status = "UNKNOWN " + txStatus; -// } -// } catch (javax.transaction.SystemException e) { -// } -// System.out.println("\n" + -// "***************************************\n" + -// "transaction " + transaction + "\n" + -// " status " + status + "\n" + -// "***************************************\n\n"); -// -// } - public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable { // System.out.println("\n" + // "***************************************\n" + @@ -313,20 +257,7 @@ public class PoolEndpointHandler implements InvocationHandler, MessageEndpoint { } } -// private void recreateInstance(final boolean exceptionAlreadyThrown) throws UnavailableException { -// try { -// instance = instanceManager.recreateInstance(instance); -// } catch (final UnavailableException e) { -// // an error occured wile attempting to create the replacement instance -// // this endpoint is now failed -// state = State.RELEASED; -// -// // if bean threw an exception, do not override that exception -// if (!exceptionAlreadyThrown) { -// throw e; -// } -// } -// } + public void release() { if (state == State.RELEASED) {
