You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2016/11/11 19:23:40 UTC
[10/11] activemq-artemis git commit: Fix issues after merge
Fix issues after merge
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/03718225
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/03718225
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/03718225
Branch: refs/heads/ARTEMIS-780
Commit: 037182250ead410c429b2d6d0f3a45cad0ec342e
Parents: 84df373
Author: jbertram <jb...@apache.com>
Authored: Thu Nov 10 19:10:01 2016 -0600
Committer: jbertram <jb...@apache.com>
Committed: Thu Nov 10 20:51:14 2016 -0600
----------------------------------------------------------------------
.../config/ActiveMQDefaultConfiguration.java | 3 -
.../artemis/jms/client/ActiveMQSession.java | 2 +-
.../management/impl/AddressControlImpl.java | 2 +-
.../core/config/impl/FileConfigurationTest.java | 61 +-------------------
.../tests/integration/stomp/StompTest.java | 49 ++--------------
.../tests/integration/stomp/StompTestBase.java | 2 +-
.../stomp/StompTestWithLargeMessages.java | 22 -------
.../stomp/StompTestWithMessageID.java | 1 +
.../stomp/util/StompFrameFactoryV11.java | 2 -
.../stomp/util/StompFrameFactoryV12.java | 2 -
.../integration/stomp/v11/ExtraStompTest.java | 5 +-
.../jms/tests/message/MessageHeaderTest.java | 2 +-
12 files changed, 15 insertions(+), 138 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/03718225/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
index 8227e06..5511ab6 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
@@ -1188,11 +1188,8 @@ public final class ActiveMQDefaultConfiguration {
public static boolean getDefaultDeleteQueueOnNoConsumers() {
return DEFAULT_DELETE_QUEUE_ON_NO_CONSUMERS;
}
-<<<<<<< HEAD
public static String getInternalNamingPrefix() {
return DEFAULT_INTERNAL_NAMING_PREFIX;
}
-=======
->>>>>>> af5f1b1... ARTEMIS-782 Added configuration elements for new address model
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/03718225/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java
index 35bbfa0..acbb5e9 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java
@@ -317,7 +317,7 @@ public class ActiveMQSession implements QueueSession, TopicSession {
} else {
if (!response.isExists()) {
if (response.isAutoCreateJmsTopics()) {
- session.createAddress(jbd.getSimpleAddress(), true);
+ session.createAddress(jbd.getSimpleAddress(), true, true);
} else {
throw new InvalidDestinationException("Destination " + jbd.getName() + " does not exist");
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/03718225/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AddressControlImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AddressControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AddressControlImpl.java
index 5808bd3..23b8e32 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AddressControlImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AddressControlImpl.java
@@ -276,7 +276,7 @@ public class AddressControlImpl extends AbstractControl implements AddressContro
message.getBodyBuffer().writeBytes(Base64.decode(body));
}
message.setAddress(addressInfo.getName());
- postOffice.route(message, null, true);
+ postOffice.route(message, true);
return "" + message.getMessageID();
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/03718225/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java
index 59f2cdf..d95ea52 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java
@@ -46,14 +46,13 @@ import org.apache.activemq.artemis.core.security.Role;
import org.apache.activemq.artemis.core.server.JournalType;
import org.apache.activemq.artemis.core.server.SecuritySettingPlugin;
import org.apache.activemq.artemis.core.server.cluster.impl.MessageLoadBalancingType;
-import org.apache.activemq.artemis.core.server.impl.AddressInfo;
import org.apache.activemq.artemis.core.server.impl.LegacyLDAPSecuritySettingPlugin;
import org.apache.activemq.artemis.core.settings.impl.SlowConsumerPolicy;
import org.junit.Assert;
import org.junit.Test;
-import static org.apache.activemq.artemis.core.config.CoreAddressConfiguration.RoutingType.ANYCAST;
-import static org.apache.activemq.artemis.core.config.CoreAddressConfiguration.RoutingType.MULTICAST;
+import static org.apache.activemq.artemis.core.server.impl.AddressInfo.RoutingType.ANYCAST;
+import static org.apache.activemq.artemis.core.server.impl.AddressInfo.RoutingType.MULTICAST;
public class FileConfigurationTest extends ConfigurationImplTest {
@@ -372,62 +371,6 @@ public class FileConfigurationTest extends ConfigurationImplTest {
// Addr 1
CoreAddressConfiguration addressConfiguration = conf.getAddressConfigurations().get(0);
assertEquals("addr1", addressConfiguration.getName());
- assertEquals(AddressInfo.RoutingType.ANYCAST, addressConfiguration.getRoutingType());
- assertEquals(2, addressConfiguration.getQueueConfigurations().size());
-
- // Addr 1 Queue 1
- CoreQueueConfiguration queueConfiguration = addressConfiguration.getQueueConfigurations().get(0);
-
- assertEquals("q1", queueConfiguration.getName());
- assertFalse(queueConfiguration.isDurable());
- assertEquals("color='blue'", queueConfiguration.getFilterString());
- assertEquals(addressConfiguration.getDefaultDeleteOnNoConsumers(), queueConfiguration.getDeleteOnNoConsumers());
- assertEquals("addr1", queueConfiguration.getAddress());
- assertEquals(addressConfiguration.getDefaultMaxConsumers(), queueConfiguration.getMaxConsumers());
-
- // Addr 1 Queue 2
- queueConfiguration = addressConfiguration.getQueueConfigurations().get(1);
-
- assertEquals("q2", queueConfiguration.getName());
- assertTrue(queueConfiguration.isDurable());
- assertEquals("color='green'", queueConfiguration.getFilterString());
- assertEquals(new Integer(-1), queueConfiguration.getMaxConsumers());
- assertFalse(queueConfiguration.getDeleteOnNoConsumers());
- assertEquals("addr1", queueConfiguration.getAddress());
-
- // Addr 2
- addressConfiguration = conf.getAddressConfigurations().get(1);
- assertEquals("addr2", addressConfiguration.getName());
- assertEquals(AddressInfo.RoutingType.MULTICAST, addressConfiguration.getRoutingType());
- assertEquals(2, addressConfiguration.getQueueConfigurations().size());
-
- // Addr 2 Queue 1
- queueConfiguration = addressConfiguration.getQueueConfigurations().get(0);
-
- assertEquals("q3", queueConfiguration.getName());
- assertTrue(queueConfiguration.isDurable());
- assertEquals("color='red'", queueConfiguration.getFilterString());
- assertEquals(new Integer(10), queueConfiguration.getMaxConsumers());
- assertEquals(addressConfiguration.getDefaultDeleteOnNoConsumers(), queueConfiguration.getDeleteOnNoConsumers());
- assertEquals("addr2", queueConfiguration.getAddress());
-
- // Addr 2 Queue 2
- queueConfiguration = addressConfiguration.getQueueConfigurations().get(1);
-
- assertEquals("q4", queueConfiguration.getName());
- assertTrue(queueConfiguration.isDurable());
- assertNull(queueConfiguration.getFilterString());
- assertEquals(addressConfiguration.getDefaultMaxConsumers(), queueConfiguration.getMaxConsumers());
- assertTrue(queueConfiguration.getDeleteOnNoConsumers());
- assertEquals("addr2", queueConfiguration.getAddress());
- }
-
- private void verifyAddresses() {
- assertEquals(2, conf.getAddressConfigurations().size());
-
- // Addr 1
- CoreAddressConfiguration addressConfiguration = conf.getAddressConfigurations().get(0);
- assertEquals("addr1", addressConfiguration.getName());
assertEquals(ANYCAST, addressConfiguration.getRoutingType());
assertEquals(2, addressConfiguration.getQueueConfigurations().size());
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/03718225/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTest.java
index 91ab5d3..8e54b76 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTest.java
@@ -723,7 +723,7 @@ public class StompTest extends StompTestBase {
Assert.assertEquals(Stomp.Responses.MESSAGE, frame.getCommand());
Assert.assertTrue("Should have received the real message but got: " + frame, frame.getBody().equals("Real message"));
- conn.disconnect();
+ conn.disconnect();
}
@Test
@@ -737,7 +737,7 @@ public class StompTest extends StompTestBase {
Assert.assertNotNull(frame.getHeader(Stomp.Headers.Message.MESSAGE_ID));
ack(conn, null, frame);
- conn.disconnect();
+ conn.disconnect();
// message should not be received since message was acknowledged by the client
MessageConsumer consumer = session.createConsumer(queue);
@@ -774,34 +774,20 @@ public class StompTest extends StompTestBase {
}
protected void assertSubscribeWithClientAckThenConsumeWithAutoAck(boolean sendDisconnect) throws Exception {
-
conn.connect(defUser, defPass);
-
-// String frame = Stomp.Commands.SUBSCRIBE + "\n" +
-// Stomp.Headers.Subscribe.SUBSCRIPTION_TYPE + Stomp.Headers.SEPARATOR + AddressInfo.RoutingType.ANYCAST + "\n" +
-// Stomp.Headers.Send.DESTINATION + Stomp.Headers.SEPARATOR + getQueuePrefix() + getQueueName() + "\n" +
-// Stomp.Headers.Message.ACK + Stomp.Headers.SEPARATOR + "client\n\n" +
-// Stomp.NULL;
-//
-// sendFrame(frame);
subscribe(conn, null, Stomp.Headers.Subscribe.AckModeValues.CLIENT);
sendJmsMessage(getName());
-// frame = receiveFrame(10000);
-// Assert.assertTrue(frame.startsWith(Stomp.Responses.MESSAGE));
ClientStompFrame frame = conn.receiveFrame(10000);
Assert.assertEquals(Stomp.Responses.MESSAGE, frame.getCommand());
log.info("Reconnecting!");
if (sendDisconnect) {
- conn.disconnect();
-// reconnect();
+ conn.disconnect();
conn.destroy();
conn = StompClientConnectionFactory.createClientConnection("1.0", hostname, port);
} else {
-// reconnect(100);
-// waitForFrameToTakeEffect();
conn.destroy();
conn = StompClientConnectionFactory.createClientConnection("1.0", hostname, port);
}
@@ -809,17 +795,8 @@ public class StompTest extends StompTestBase {
// message should be received since message was not acknowledged
conn.connect(defUser, defPass);
-// frame = Stomp.Commands.SUBSCRIBE + "\n" +
-// Stomp.Headers.Subscribe.SUBSCRIPTION_TYPE + Stomp.Headers.SEPARATOR + AddressInfo.RoutingType.ANYCAST + "\n" +
-// Stomp.Headers.Subscribe.DESTINATION + Stomp.Headers.SEPARATOR + getQueuePrefix() + getQueueName() + "\n\n" +
-// Stomp.NULL;
-//
-// sendFrame(frame);
subscribe(conn, null);
-// frame = receiveFrame(10000);
-// log.info(frame);
-// Assert.assertTrue(frame.startsWith(Stomp.Responses.MESSAGE));
frame = conn.receiveFrame(10000);
Assert.assertEquals(Stomp.Responses.MESSAGE, frame.getCommand());
@@ -829,29 +806,13 @@ public class StompTest extends StompTestBase {
conn = StompClientConnectionFactory.createClientConnection("1.0", hostname, port);
// now let's make sure we don't see the message again
-// reconnect();
conn.connect(defUser, defPass);
-// frame = Stomp.Commands.SUBSCRIBE + "\n" +
-// Stomp.Headers.Subscribe.SUBSCRIPTION_TYPE + Stomp.Headers.SEPARATOR + AddressInfo.RoutingType.ANYCAST + "\n" +
-// Stomp.Headers.Send.DESTINATION + Stomp.Headers.SEPARATOR + getQueuePrefix() + getQueueName() + "\n" +
-// Stomp.Headers.RECEIPT_REQUESTED + Stomp.Headers.SEPARATOR + " 1234\n\n" +
-// Stomp.NULL;
-//
-// sendFrame(frame);
subscribe(conn, null, Stomp.Headers.Subscribe.AckModeValues.AUTO, null, true);
- // wait for SUBSCRIBE's receipt
-// frame = receiveFrame(10000);
-// Assert.assertTrue(frame.startsWith(Stomp.Responses.RECEIPT));
-
sendJmsMessage("shouldBeNextMessage");
-// frame = receiveFrame(10000);
-// Assert.assertTrue(frame.startsWith(Stomp.Responses.MESSAGE));
-// log.info(frame);
-// Assert.assertTrue(frame.contains("shouldBeNextMessage"));
frame = conn.receiveFrame(10000);
Assert.assertEquals(Stomp.Responses.MESSAGE, frame.getCommand());
Assert.assertEquals("shouldBeNextMessage", frame.getBody());
@@ -1013,9 +974,9 @@ public class StompTest extends StompTestBase {
assertEquals("Subscription queue should be deleted", 0, server.getActiveMQServer().getActiveMQServerControl().getQueueNames().length - baselineQueueCount);
- conn.disconnect();
+ conn.disconnect();
}
- //
+
@Test
public void testSubscribeToQueue() throws Exception {
final int baselineQueueCount = server.getActiveMQServer().getActiveMQServerControl().getQueueNames().length;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/03718225/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTestBase.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTestBase.java
index a55f471..3ccca7d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTestBase.java
@@ -121,7 +121,7 @@ public abstract class StompTestBase extends ActiveMQTestBase {
super.setUp();
server = createServer();
- server.start();
+ server.start();
connectionFactory = createConnectionFactory();
((ActiveMQConnectionFactory)connectionFactory).setCompressLargeMessage(isCompressLargeMessages());
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/03718225/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTestWithLargeMessages.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTestWithLargeMessages.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTestWithLargeMessages.java
index 929534f..18410be 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTestWithLargeMessages.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTestWithLargeMessages.java
@@ -16,35 +16,13 @@
*/
package org.apache.activemq.artemis.tests.integration.stomp;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-
import org.apache.activemq.artemis.api.core.SimpleString;
-import org.apache.activemq.artemis.api.core.TransportConfiguration;
import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
-import org.apache.activemq.artemis.core.config.Configuration;
-import org.apache.activemq.artemis.core.protocol.stomp.StompProtocolManagerFactory;
-import org.apache.activemq.artemis.core.registry.JndiBindingRegistry;
-import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory;
-import org.apache.activemq.artemis.core.remoting.impl.netty.NettyAcceptorFactory;
-import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
-import org.apache.activemq.artemis.core.security.Role;
-import org.apache.activemq.artemis.core.server.ActiveMQServer;
-import org.apache.activemq.artemis.core.server.ActiveMQServers;
-import org.apache.activemq.artemis.jms.server.JMSServerManager;
-import org.apache.activemq.artemis.jms.server.config.JMSConfiguration;
-import org.apache.activemq.artemis.jms.server.config.impl.JMSConfigurationImpl;
-import org.apache.activemq.artemis.jms.server.config.impl.JMSQueueConfigurationImpl;
-import org.apache.activemq.artemis.jms.server.config.impl.TopicConfigurationImpl;
-import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl;
-import org.apache.activemq.artemis.spi.core.security.ActiveMQJAASSecurityManager;
import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
import org.apache.activemq.artemis.tests.integration.largemessage.LargeMessageTestBase;
import org.apache.activemq.artemis.tests.integration.stomp.util.ClientStompFrame;
import org.apache.activemq.artemis.tests.integration.stomp.util.StompClientConnection;
import org.apache.activemq.artemis.tests.integration.stomp.util.StompClientConnectionFactory;
-import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/03718225/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTestWithMessageID.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTestWithMessageID.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTestWithMessageID.java
index fc44437..69c214b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTestWithMessageID.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTestWithMessageID.java
@@ -31,6 +31,7 @@ import org.junit.Test;
public class StompTestWithMessageID extends StompTestBase {
+ @Override
public boolean isEnableStompMessageId() {
return true;
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/03718225/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompFrameFactoryV11.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompFrameFactoryV11.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompFrameFactoryV11.java
index 807b3f0..dc9622f 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompFrameFactoryV11.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompFrameFactoryV11.java
@@ -16,8 +16,6 @@
*/
package org.apache.activemq.artemis.tests.integration.stomp.util;
-import java.util.StringTokenizer;
-
/**
* 1.1 frames
* <br>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/03718225/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompFrameFactoryV12.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompFrameFactoryV12.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompFrameFactoryV12.java
index dbd32e0..e128094 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompFrameFactoryV12.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompFrameFactoryV12.java
@@ -16,8 +16,6 @@
*/
package org.apache.activemq.artemis.tests.integration.stomp.util;
-import java.util.StringTokenizer;
-
public class StompFrameFactoryV12 extends StompFrameFactoryV11 {
@Override
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/03718225/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/ExtraStompTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/ExtraStompTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/ExtraStompTest.java
index 5414a9f..4bd9b6f 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/ExtraStompTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/ExtraStompTest.java
@@ -35,6 +35,7 @@ public class ExtraStompTest extends StompTestBase {
private StompClientConnection connV10;
private StompClientConnection connV11;
+ @Override
public boolean isPersistenceEnabled() {
return true;
}
@@ -119,8 +120,8 @@ public class ExtraStompTest extends StompTestBase {
@Test
public void testNoGarbageAfterPersistentMessageV11() throws Exception {
testNoGarbageAfterPersistentMessage(connV11);
- }
-
+ }
+
public void testNoGarbageAfterPersistentMessage(StompClientConnection conn) throws Exception {
subscribe(conn, "a-sub");
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/03718225/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageHeaderTest.java
----------------------------------------------------------------------
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageHeaderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageHeaderTest.java
index 994c1a6..f8b7153 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageHeaderTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageHeaderTest.java
@@ -1125,7 +1125,7 @@ public class MessageHeaderTest extends MessageHeaderTestBase {
}
@Override
- public void createAddress(SimpleString address, boolean multicast) throws ActiveMQException {
+ public void createAddress(SimpleString address, boolean multicast, final boolean autoCreated) throws ActiveMQException {
}