You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2017/03/14 12:36:11 UTC
[2/2] tomee git commit: TOMEE-2021 - small fixes to compile under
Java 1.6
TOMEE-2021 - small fixes to compile under Java 1.6
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/a46a7586
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/a46a7586
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/a46a7586
Branch: refs/heads/tomee-1.7.x
Commit: a46a75862878c81dbe495ca636b7eecc50d06052
Parents: 8dd71d4
Author: Jonathan Gallimore <jo...@jrg.me.uk>
Authored: Mon Mar 13 11:33:39 2017 +0000
Committer: Jonathan Gallimore <jo...@jrg.me.uk>
Committed: Mon Mar 13 11:33:39 2017 +0000
----------------------------------------------------------------------
.../apache/openejb/core/mdb/MdbContainer.java | 2 +-
.../activemq/ActiveMQResourceAdapter.java | 37 ++++++++++----------
2 files changed, 20 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/a46a7586/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainer.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainer.java b/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainer.java
index b382799..695adca 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainer.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainer.java
@@ -72,7 +72,7 @@ import static org.apache.openejb.core.transaction.EjbTransactionUtil.handleSyste
public class MdbContainer implements RpcContainer {
private static final Logger logger = Logger.getInstance(LogCategory.OPENEJB, "org.apache.openejb.util.resources");
- private static final ThreadLocal<BeanContext> CURRENT = new ThreadLocal<>();
+ private static final ThreadLocal<BeanContext> CURRENT = new ThreadLocal<BeanContext>();
private static final Object[] NO_ARGS = new Object[0];
http://git-wip-us.apache.org/repos/asf/tomee/blob/a46a7586/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQResourceAdapter.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQResourceAdapter.java b/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQResourceAdapter.java
index b0ad912..0a60775 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQResourceAdapter.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQResourceAdapter.java
@@ -20,6 +20,7 @@ package org.apache.openejb.resource.activemq;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.ra.ActiveMQEndpointActivationKey;
import org.apache.activemq.ra.ActiveMQEndpointWorker;
+import org.apache.activemq.ra.MessageActivationSpec;
import org.apache.openejb.BeanContext;
import org.apache.openejb.core.mdb.MdbContainer;
import org.apache.openejb.monitoring.LocalMBeanServer;
@@ -29,6 +30,7 @@ import org.apache.openejb.util.LogCategory;
import org.apache.openejb.util.Logger;
import org.apache.openejb.util.URISupport;
import org.apache.openejb.util.URLs;
+import org.apache.openejb.util.reflection.Reflections;
import javax.management.Attribute;
import javax.management.AttributeList;
@@ -69,7 +71,7 @@ public class ActiveMQResourceAdapter extends org.apache.activemq.ra.ActiveMQReso
private String useDatabaseLock;
private String startupTimeout = "60000";
private BootstrapContext bootstrapContext;
- private final Map<BeanContext, ObjectName> mbeanNames = new ConcurrentHashMap<>();
+ private final Map<BeanContext, ObjectName> mbeanNames = new ConcurrentHashMap<BeanContext, ObjectName>();
public String getDataSource() {
return dataSource;
@@ -343,23 +345,22 @@ public class ActiveMQResourceAdapter extends org.apache.activemq.ra.ActiveMQReso
@Override
public Object invoke(final String actionName, final Object[] params, final String[] signature) throws MBeanException, ReflectionException {
- switch (actionName) {
- case "stop":
- try {
- worker.stop();
- } catch (final InterruptedException e) {
- Thread.interrupted();
- }
- break;
- case "start":
- try {
- worker.start();
- } catch (ResourceException e) {
- throw new MBeanException(new IllegalStateException(e.getMessage()));
- }
- break;
- default:
- throw new MBeanException(new IllegalStateException("unsupported operation: " + actionName));
+ if (actionName.equals("stop")) {
+ try {
+ worker.stop();
+ } catch (final InterruptedException e) {
+ Thread.interrupted();
+ }
+
+ } else if (actionName.equals("start")) {
+ try {
+ worker.start();
+ } catch (ResourceException e) {
+ throw new MBeanException(new IllegalStateException(e.getMessage()));
+ }
+
+ } else {
+ throw new MBeanException(new IllegalStateException("unsupported operation: " + actionName));
}
return null;
}