fix conflicts backport from tomee 7.0.x
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/76da7349 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/76da7349 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/76da7349 Branch: refs/heads/tomee-1.7.x Commit: 76da734980bb05336058c57e1a5e561086279a12 Parents: e5c5f9d Author: Thiago Veronezi <[email protected]> Authored: Wed Jan 17 15:37:45 2018 -0500 Committer: Thiago Veronezi <[email protected]> Committed: Wed Jan 17 15:37:45 2018 -0500 ---------------------------------------------------------------------- .../core/mdb/AbstractEndpointHandler.java | 21 +------------------- 1 file changed, 1 insertion(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/76da7349/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 19a6688..46336d6 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 @@ -110,7 +110,7 @@ abstract class AbstractEndpointHandler implements InvocationHandler, MessageEndp Object value = null; try { // deliver the message - value = container.invoke(instance, method, null, wrapMessageForAmq5(args)); + value = container.invoke(instance, method, null, args); } catch (final SystemException se) { throwable = se.getRootCause() != null ? se.getRootCause() : se; state = State.SYSTEM_EXCEPTION; @@ -166,25 +166,6 @@ abstract class AbstractEndpointHandler implements InvocationHandler, MessageEndp } } - // workaround for AMQ 5/JMS 2 support - private Object[] wrapMessageForAmq5(final Object[] args) { - if (args == null || args.length != 1 || DelegateMessage.class.isInstance(args[0])) { - return args; - } - - if (isAmq == null) { - synchronized (this) { - if (isAmq == null) { - isAmq = args[0].getClass().getName().startsWith("org.apache.activemq."); - } - } - } - if (isAmq) { - args[0] = JMS2.wrap(Message.class.cast(args[0])); - } - return args; - } - private boolean isValidException(final Method method, final Throwable throwable) { if (throwable instanceof RuntimeException || throwable instanceof Error) { return true;
