You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2016/01/11 19:21:33 UTC
[2/2] activemq-artemis git commit: Remove dead code
Remove dead code
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/66e82be6
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/66e82be6
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/66e82be6
Branch: refs/heads/master
Commit: 66e82be652598c2c7f5a82cf292897d0e3ff732a
Parents: cfff68f
Author: Ville Skyttä <vi...@iki.fi>
Authored: Sat Jan 9 13:55:44 2016 +0200
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Jan 11 13:21:26 2016 -0500
----------------------------------------------------------------------
.../core/server/impl/ServerSessionImpl.java | 8 ++---
.../jms/example/ClusteredTopicExample.java | 13 --------
.../org/apache/activemq/bugs/AMQ2401Test.java | 35 ++++++--------------
.../org/apache/activemq/bugs/AMQ2413Test.java | 32 +++++-------------
.../BridgeServerLocatorConfigurationTest.java | 6 ----
...FlowControlOnIgnoreLargeMessageBodyTest.java | 13 --------
.../tests/unit/jms/misc/ManifestTest.java | 21 +++---------
7 files changed, 29 insertions(+), 99 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/66e82be6/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
index ebe2f8a..c3a979b 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
@@ -623,12 +623,12 @@ public class ServerSessionImpl implements ServerSession, FailureListener {
@Override
public QueueQueryResult executeQueueQuery(final SimpleString name) throws Exception {
- boolean autoCreateJmsQueues = name.toString().startsWith(ResourceNames.JMS_QUEUE) && server.getAddressSettingsRepository().getMatch(name.toString()).isAutoCreateJmsQueues();
-
if (name == null) {
throw ActiveMQMessageBundle.BUNDLE.queueNameIsNull();
}
+ boolean autoCreateJmsQueues = name.toString().startsWith(ResourceNames.JMS_QUEUE) && server.getAddressSettingsRepository().getMatch(name.toString()).isAutoCreateJmsQueues();
+
QueueQueryResult response;
Binding binding = postOffice.getBinding(name);
@@ -658,12 +658,12 @@ public class ServerSessionImpl implements ServerSession, FailureListener {
@Override
public BindingQueryResult executeBindingQuery(final SimpleString address) throws Exception {
- boolean autoCreateJmsQueues = address.toString().startsWith(ResourceNames.JMS_QUEUE) && server.getAddressSettingsRepository().getMatch(address.toString()).isAutoCreateJmsQueues();
-
if (address == null) {
throw ActiveMQMessageBundle.BUNDLE.addressIsNull();
}
+ boolean autoCreateJmsQueues = address.toString().startsWith(ResourceNames.JMS_QUEUE) && server.getAddressSettingsRepository().getMatch(address.toString()).isAutoCreateJmsQueues();
+
List<SimpleString> names = new ArrayList<>();
// make an exception for the management address (see HORNETQ-29)
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/66e82be6/examples/features/clustered/clustered-topic/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredTopicExample.java
----------------------------------------------------------------------
diff --git a/examples/features/clustered/clustered-topic/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredTopicExample.java b/examples/features/clustered/clustered-topic/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredTopicExample.java
index f3ce9a0..10592c9 100644
--- a/examples/features/clustered/clustered-topic/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredTopicExample.java
+++ b/examples/features/clustered/clustered-topic/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredTopicExample.java
@@ -23,7 +23,6 @@ import javax.jms.MessageProducer;
import javax.jms.Session;
import javax.jms.TextMessage;
import javax.jms.Topic;
-import javax.naming.InitialContext;
import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
@@ -39,10 +38,6 @@ public class ClusteredTopicExample {
Connection connection1 = null;
- InitialContext ic0 = null;
-
- InitialContext ic1 = null;
-
try {
// Step 1. Instantiate topic
@@ -116,14 +111,6 @@ public class ClusteredTopicExample {
if (connection1 != null) {
connection1.close();
}
-
- if (ic0 != null) {
- ic0.close();
- }
-
- if (ic1 != null) {
- ic1.close();
- }
}
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/66e82be6/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2401Test.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2401Test.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2401Test.java
index 9fdc2e0..edd4e8f 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2401Test.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2401Test.java
@@ -90,33 +90,20 @@ public class AMQ2401Test extends TestCase implements MessageListener {
public void testDupsOk() throws Exception {
- TestProducer p = null;
- TestConsumer c = null;
- try {
- latch = new CountDownLatch(SEND_COUNT);
-
- for (int i = 0; i < CONSUMER_COUNT; i++) {
- TestConsumer consumer = new TestConsumer();
- consumer.start();
- services.add(consumer);
- }
- for (int i = 0; i < PRODUCER_COUNT; i++) {
- TestProducer producer = new TestProducer();
- producer.start();
- services.add(producer);
- }
+ latch = new CountDownLatch(SEND_COUNT);
- waitForMessageReceipt(TimeUnit.SECONDS.toMillis(30));
+ for (int i = 0; i < CONSUMER_COUNT; i++) {
+ TestConsumer consumer = new TestConsumer();
+ consumer.start();
+ services.add(consumer);
}
- finally {
- if (p != null) {
- p.close();
- }
-
- if (c != null) {
- c.close();
- }
+ for (int i = 0; i < PRODUCER_COUNT; i++) {
+ TestProducer producer = new TestProducer();
+ producer.start();
+ services.add(producer);
}
+
+ waitForMessageReceipt(TimeUnit.SECONDS.toMillis(30));
}
@Override
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/66e82be6/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2413Test.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2413Test.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2413Test.java
index 3216215..ed1af90 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2413Test.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2413Test.java
@@ -128,33 +128,19 @@ public class AMQ2413Test extends CombinationTestSupport implements MessageListen
public void testReceipt() throws Exception {
running.set(true);
- TestProducer p = null;
- TestConsumer c = null;
- try {
-
- for (int i = 0; i < CONSUMER_COUNT; i++) {
- TestConsumer consumer = new TestConsumer();
- consumer.start();
- services.add(consumer);
- }
- for (int i = 0; i < PRODUCER_COUNT; i++) {
- TestProducer producer = new TestProducer(i);
- producer.start();
- services.add(producer);
- }
- waitForMessageReceipt();
+ for (int i = 0; i < CONSUMER_COUNT; i++) {
+ TestConsumer consumer = new TestConsumer();
+ consumer.start();
+ services.add(consumer);
}
- finally {
- if (p != null) {
- p.close();
- }
-
- if (c != null) {
- c.close();
- }
+ for (int i = 0; i < PRODUCER_COUNT; i++) {
+ TestProducer producer = new TestProducer(i);
+ producer.start();
+ services.add(producer);
}
+ waitForMessageReceipt();
}
/*
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/66e82be6/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/BridgeServerLocatorConfigurationTest.java
----------------------------------------------------------------------
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/BridgeServerLocatorConfigurationTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/BridgeServerLocatorConfigurationTest.java
index 20d3722..792263f 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/BridgeServerLocatorConfigurationTest.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/BridgeServerLocatorConfigurationTest.java
@@ -22,7 +22,6 @@ import java.util.List;
import java.util.Map;
import org.apache.activemq.artemis.api.core.TransportConfiguration;
-import org.apache.activemq.artemis.api.core.client.ServerLocator;
import org.apache.activemq.artemis.core.config.BridgeConfiguration;
import org.apache.activemq.artemis.core.config.CoreQueueConfiguration;
import org.apache.activemq.artemis.core.remoting.impl.invm.TransportConstants;
@@ -75,7 +74,6 @@ public class BridgeServerLocatorConfigurationTest extends ActiveMQTestBase {
server1Params.put(TransportConstants.SERVER_ID_PROP_NAME, 1);
}
ActiveMQServer server1 = createClusteredServerWithParams(isNetty(), 1, true, server1Params);
- ServerLocator locator = null;
try {
final String testAddress = "testAddress";
final String queueName0 = "queue0";
@@ -118,10 +116,6 @@ public class BridgeServerLocatorConfigurationTest extends ActiveMQTestBase {
assertEquals(BRIDGE_TTL, bridgeTTL);
}
finally {
- if (locator != null) {
- locator.close();
- }
-
serverWithBridge.stop();
server1.stop();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/66e82be6/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/FlowControlOnIgnoreLargeMessageBodyTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/FlowControlOnIgnoreLargeMessageBodyTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/FlowControlOnIgnoreLargeMessageBodyTest.java
index 4901de1..c872d28 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/FlowControlOnIgnoreLargeMessageBodyTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/FlowControlOnIgnoreLargeMessageBodyTest.java
@@ -31,8 +31,6 @@ import javax.jms.MessageProducer;
import javax.jms.Session;
import javax.jms.Topic;
import javax.jms.TopicSubscriber;
-import javax.naming.Context;
-import javax.naming.NamingException;
import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
import org.apache.activemq.artemis.tests.util.JMSTestBase;
@@ -290,7 +288,6 @@ public class FlowControlOnIgnoreLargeMessageBodyTest extends JMSTestBase {
@Test
public void testFlowControl() {
- Context context = null;
try {
LoadProducer producer = new LoadProducer("producer", topic, cf, FlowControlOnIgnoreLargeMessageBodyTest.TOTAL_MESSAGES_COUNT);
@@ -341,16 +338,6 @@ public class FlowControlOnIgnoreLargeMessageBodyTest extends JMSTestBase {
catch (Exception e) {
log.warn(e.getMessage(), e);
}
- finally {
- if (context != null) {
- try {
- context.close();
- }
- catch (NamingException ex) {
- log.warn(ex.getMessage(), ex);
- }
- }
- }
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/66e82be6/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/misc/ManifestTest.java
----------------------------------------------------------------------
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/misc/ManifestTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/misc/ManifestTest.java
index c4d2b4b..ef434b1 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/misc/ManifestTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/misc/ManifestTest.java
@@ -25,7 +25,6 @@ import java.util.jar.Attributes;
import java.util.jar.JarFile;
import java.util.jar.Manifest;
-import javax.jms.Connection;
import javax.jms.ConnectionMetaData;
import org.junit.Assert;
@@ -61,24 +60,14 @@ public class ManifestTest extends ActiveMQTestBase {
JarFile jar = new JarFile(file);
Manifest manifest = jar.getManifest();
- // Open a connection and get ConnectionMetaData
- Connection conn = null;
+ ActiveMQServer server = ActiveMQServers.newActiveMQServer(createBasicConfig());
- try {
- ActiveMQServer server = ActiveMQServers.newActiveMQServer(createBasicConfig());
+ ConnectionMetaData meta = new ActiveMQConnectionMetaData(server.getVersion());
- ConnectionMetaData meta = new ActiveMQConnectionMetaData(server.getVersion());
+ // Compare the value from ConnectionMetaData and MANIFEST.MF
+ Attributes attrs = manifest.getMainAttributes();
- // Compare the value from ConnectionMetaData and MANIFEST.MF
- Attributes attrs = manifest.getMainAttributes();
-
- Assert.assertEquals(meta.getProviderVersion(), attrs.getValue("ActiveMQ-Version"));
- }
- finally {
- if (conn != null) {
- conn.close();
- }
- }
+ Assert.assertEquals(meta.getProviderVersion(), attrs.getValue("ActiveMQ-Version"));
}
// Package protected ---------------------------------------------