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:37 UTC
[42/50] tomee git commit: fix conflicts backport from tomee 7.0.x
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/94fa39e5
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/94fa39e5
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/94fa39e5
Branch: refs/heads/tomee-1.7.x
Commit: 94fa39e5b08a7b254fdf7ec80e116994d3d9489e
Parents: 4fc6f32
Author: Thiago Veronezi <th...@veronezi.org>
Authored: Wed Jan 17 13:24:17 2018 -0500
Committer: Thiago Veronezi <th...@veronezi.org>
Committed: Wed Jan 17 13:24:17 2018 -0500
----------------------------------------------------------------------
.../org/apache/openejb/core/mdb/AbstractEndpointHandler.java | 2 --
.../java/org/apache/openejb/core/mdb/MdbInstanceManager.java | 4 ++--
.../main/java/org/apache/openejb/core/mdb/MdbPoolContainer.java | 5 ++++-
3 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/94fa39e5/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 fc2bd22..19a6688 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
@@ -18,8 +18,6 @@ package org.apache.openejb.core.mdb;
import org.apache.openejb.ApplicationException;
import org.apache.openejb.SystemException;
-import org.apache.openejb.resource.activemq.jms2.DelegateMessage;
-import org.apache.openejb.resource.activemq.jms2.JMS2;
import javax.ejb.EJBException;
import javax.jms.Message;
http://git-wip-us.apache.org/repos/asf/tomee/blob/94fa39e5/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbInstanceManager.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbInstanceManager.java b/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbInstanceManager.java
index a74dd03..3355e21 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbInstanceManager.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbInstanceManager.java
@@ -109,8 +109,8 @@ public class MdbInstanceManager {
private final ThreadPoolExecutor executor;
private final ScheduledExecutorService scheduledExecutor;
- private final Map<BeanContext, MdbPoolContainer.MdbActivationContext> activationContexts = new ConcurrentHashMap<>();
- private final Map<BeanContext, ObjectName> mbeanNames = new ConcurrentHashMap<>();
+ private final Map<BeanContext, MdbPoolContainer.MdbActivationContext> activationContexts = new ConcurrentHashMap<BeanContext, MdbPoolContainer.MdbActivationContext>();
+ private final Map<BeanContext, ObjectName> mbeanNames = new ConcurrentHashMap<BeanContext, ObjectName>();
protected final List<ObjectName> jmxNames = new ArrayList<ObjectName>();
private final ResourceAdapter resourceAdapter;
private final InboundRecovery inboundRecovery;
http://git-wip-us.apache.org/repos/asf/tomee/blob/94fa39e5/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbPoolContainer.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbPoolContainer.java b/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbPoolContainer.java
index 4b3ac2d..bc0edb6 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbPoolContainer.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbPoolContainer.java
@@ -355,7 +355,10 @@ public class MdbPoolContainer implements RpcContainer, BaseMdbContainer {
// invoke the target method
returnValue = _invoke(instance, targetMethod, args, deployInfo, type, mdbCallContext, callContext);
return returnValue;
- } catch (final ApplicationException | SystemException e) {
+ } catch (final ApplicationException e) {
+ openEjbException = e;
+ throw e;
+ } catch (final SystemException e) {
openEjbException = e;
throw e;
} finally {