Apache/activemq-artemis
1
0
Fork 0
mirror of https://github.com/apache/activemq-artemis.git synced 2025-03-04 16:29:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

This closes #2160

Browse Source
This commit is contained in:
Justin Bertram 2018-06-29 13:36:50 -05:00
commit d8ecf24733
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/PostOffice.java
View File

@ -69,7 +69,7 @@ public interface PostOffice extends ActiveMQComponent {
Integer maxConsumers,
Boolean purgeOnNoConsumers,
Boolean exclusive,
String user) throws Exception;
SimpleString user) throws Exception;
List<Queue> listQueuesForAddress(SimpleString address) throws Exception;

4
artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java
View File

@ -468,7 +468,7 @@ public class PostOfficeImpl implements PostOffice, NotificationListener, Binding
Integer maxConsumers,
Boolean purgeOnNoConsumers,
Boolean exclusive,
String user) throws Exception {
SimpleString user) throws Exception {
synchronized (addressLock) {
final QueueBinding queueBinding = (QueueBinding) addressManager.getBinding(name);
if (queueBinding == null) {
@ -514,7 +514,7 @@ public class PostOfficeImpl implements PostOffice, NotificationListener, Binding
}
if ((user != null && !user.equals(queue.getUser()) || (user == null && queue.getUser() != null))) {
changed = true;
queue.setUser(SimpleString.toSimpleString(user));
queue.setUser(user);
}
if (changed) {

2
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
View File

@ -2970,7 +2970,7 @@ public class ActiveMQServerImpl implements ActiveMQServer {
Boolean purgeOnNoConsumers,
Boolean exclusive,
String user) throws Exception {
final QueueBinding queueBinding = this.postOffice.updateQueue(new SimpleString(name), routingType, maxConsumers, purgeOnNoConsumers, exclusive, user);
final QueueBinding queueBinding = this.postOffice.updateQueue(new SimpleString(name), routingType, maxConsumers, purgeOnNoConsumers, exclusive, new SimpleString(user));
if (queueBinding != null) {
final Queue queue = queueBinding.getQueue();
return queue;

2
tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/fakes/FakePostOffice.java
View File

@ -49,7 +49,7 @@ public class FakePostOffice implements PostOffice {
Integer maxConsumers,
Boolean purgeOnNoConsumers,
Boolean exclusive,
String user) throws Exception {
SimpleString user) throws Exception {
return null;
}