Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

This closes #3209

This commit is contained in:
Clebert Suconic 2020-07-01 08:33:50 -04:00
parent 3d746d3b23 257d353896
commit 3250e5b954
6 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -720,15 +720,12 @@ public class PostOfficeImpl implements PostOffice, NotificationListener, Binding
queue.setConfigurationManaged(queueConfiguration.isConfigurationManaged());
changed = true;
}
/* Why is this?
if (logger.isDebugEnabled()) {
if (queueConfiguration.getUser() == null && queue.getUser() != null) {
logger.debug("Ignoring updating Queue to a NULL user");
}
}
*/
// user
if (!Objects.equals(queue.getUser(), queueConfiguration.getUser())) {
if (queueConfiguration.getUser() != null && !queueConfiguration.getUser().equals(queue.getUser())) {
changed = true;
queue.setUser(queueConfiguration.getUser());
}

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

@ -4003,7 +4003,11 @@ public class ActiveMQServerImpl implements ActiveMQServer {
}
}
for (final SimpleString divertName : divertsToRemove) {
destroyDivert(divertName);
try {
destroyDivert(divertName);
} catch (Throwable e) {
logger.warn("Divert " + divertName + " could not be removed", e);
}
}
ActiveMQServerLogger.LOGGER.reloadingConfiguration("addresses");

1
tests/integration-tests/src/test/resources/reload-queue-filter-removed.xml
View File

@ -25,6 +25,7 @@ under the License.
<core xmlns="urn:activemq:core">
<security-enabled>false</security-enabled>
<persistence-enabled>false</persistence-enabled>
<configuration-file-refresh-period>100</configuration-file-refresh-period>
<acceptors>
<acceptor name="artemis">tcp://0.0.0.0:61616</acceptor>

2
tests/integration-tests/src/test/resources/reload-queue-filter-updated-empty.xml
View File

@ -25,6 +25,8 @@ under the License.
<core xmlns="urn:activemq:core">
<security-enabled>false</security-enabled>
<persistence-enabled>false</persistence-enabled>
<configuration-file-refresh-period>100</configuration-file-refresh-period>
<configuration-file-refresh-period>100</configuration-file-refresh-period>
<acceptors>
<acceptor name="artemis">tcp://0.0.0.0:61616</acceptor>

1
tests/integration-tests/src/test/resources/reload-queue-filter-updated.xml
View File

@ -25,6 +25,7 @@ under the License.
<core xmlns="urn:activemq:core">
<security-enabled>false</security-enabled>
<persistence-enabled>false</persistence-enabled>
<configuration-file-refresh-period>100</configuration-file-refresh-period>
<acceptors>
<acceptor name="artemis">tcp://0.0.0.0:61616</acceptor>

1
tests/integration-tests/src/test/resources/reload-queue-filter.xml
View File

@ -25,6 +25,7 @@ under the License.
<core xmlns="urn:activemq:core">
<security-enabled>false</security-enabled>
<persistence-enabled>false</persistence-enabled>
<configuration-file-refresh-period>100</configuration-file-refresh-period>
<acceptors>
<acceptor name="artemis">tcp://0.0.0.0:61616</acceptor>