Repository: activemq-artemis Updated Branches: refs/heads/ARTEMIS-780 d973065ee -> 16a643b74
Fix issues introduced by auto-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/16a643b7 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/16a643b7 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/16a643b7 Branch: refs/heads/ARTEMIS-780 Commit: 16a643b74ae03dfbd7ab70398bc7fb6e1e7c47fb Parents: d973065 Author: Martyn Taylor <[email protected]> Authored: Tue Dec 6 15:50:51 2016 +0000 Committer: Martyn Taylor <[email protected]> Committed: Tue Dec 6 15:50:51 2016 +0000 ---------------------------------------------------------------------- .../activemq/artemis/core/server/ServerSession.java | 2 +- .../artemis/core/server/impl/ServerSessionImpl.java | 14 +++++++------- .../tests/unit/core/remoting/AcceptorsTest.java | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/16a643b7/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ServerSession.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ServerSession.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ServerSession.java index b117f86..9559d74 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ServerSession.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ServerSession.java @@ -203,7 +203,7 @@ public interface ServerSession extends SecurityAuth { void addMetaData(String key, String data); -A boolean addUniqueMetaData(String key, String data); + boolean addUniqueMetaData(String key, String data); String getMetaData(String key); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/16a643b7/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 fc9cddf..7447f65 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 @@ -423,7 +423,7 @@ public class ServerSessionImpl implements ServerSession, FailureListener { throw ActiveMQMessageBundle.BUNDLE.noSuchQueue(queueName); } - SimpleString address = getAddress(binding.getAddress()); + SimpleString address = removePrefix(binding.getAddress()); if (browseOnly) { try { securityCheck(address, CheckType.BROWSE, this); @@ -600,7 +600,7 @@ public class ServerSessionImpl implements ServerSession, FailureListener { boolean durable, final SimpleString filterString) throws Exception { - address = getAddress(address); + address = removePrefix(address); securityCheck(address, CheckType.CREATE_NON_DURABLE_QUEUE, this); @@ -703,7 +703,7 @@ public class ServerSessionImpl implements ServerSession, FailureListener { @Override public BindingQueryResult executeBindingQuery(final SimpleString address) throws Exception { - return server.bindingQuery(getAddress(address)); + return server.bindingQuery(removePrefix(address)); } @Override @@ -1305,7 +1305,7 @@ public class ServerSessionImpl implements ServerSession, FailureListener { message.putStringProperty(Message.HDR_VALIDATED_USER, SimpleString.toSimpleString(validatedUser)); } - SimpleString address = getAddress(message.getAddress()); + SimpleString address = removePrefix(message.getAddress()); if (defaultAddress == null && address != null) { defaultAddress = address; @@ -1370,7 +1370,7 @@ public class ServerSessionImpl implements ServerSession, FailureListener { @Override public void requestProducerCredits(SimpleString address, final int credits) throws Exception { - final SimpleString addr = getAddress(address); + final SimpleString addr = removePrefix(address); PagingStore store = server.getPagingManager().getPageStore(addr); if (!store.checkMemory(new Runnable() { @@ -1561,7 +1561,7 @@ public class ServerSessionImpl implements ServerSession, FailureListener { final ServerMessage message, final boolean direct) throws Exception { try { - securityCheck(getAddress(message.getAddress()), CheckType.MANAGE, this); + securityCheck(removePrefix(message.getAddress()), CheckType.MANAGE, this); } catch (ActiveMQException e) { if (!autoCommitSends) { tx.markAsRollbackOnly(e); @@ -1698,7 +1698,7 @@ public class ServerSessionImpl implements ServerSession, FailureListener { } } - private SimpleString getAddress(SimpleString address) { + private SimpleString removePrefix(SimpleString address) { if (prefixEnabled) { return PrefixUtil.getAddress(address, prefixes); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/16a643b7/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/AcceptorsTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/AcceptorsTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/AcceptorsTest.java index bd217e3..6889393 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/AcceptorsTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/remoting/AcceptorsTest.java @@ -47,7 +47,7 @@ public class AcceptorsTest extends ActiveMQTestBase { ActiveMQServer server = createServer(config); - server.start();C + server.start(); waitForServerToStart(server); assertNotNull(server.getRemotingService().getAcceptor("Acceptor1"));
