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

ARTEMIS-5150: ActiveMQServerControlImpl.getHAPolicy() gets NPE 

When you start the broker without configuring HAPolicy, if clients
call this management api it'll get NPE because it doesn't check
if the HAPolicyConfiguration is null.
This commit is contained in:
Howard Gao 2024-11-12 11:52:52 +08:00 committed by Gary Tully
parent 828e112b15
commit c8e3c0060a
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,6 +75,7 @@ import org.apache.activemq.artemis.core.config.BridgeConfiguration;
import org.apache.activemq.artemis.core.config.Configuration;
import org.apache.activemq.artemis.core.config.ConnectorServiceConfiguration;
import org.apache.activemq.artemis.core.config.DivertConfiguration;
import org.apache.activemq.artemis.core.config.HAPolicyConfiguration;
import org.apache.activemq.artemis.core.config.TransformerConfiguration;
import org.apache.activemq.artemis.core.filter.Filter;
import org.apache.activemq.artemis.core.management.impl.view.AddressView;
@ -834,7 +835,8 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
@Override
public String getHAPolicy() {
return configuration.getHAPolicyConfiguration().getType().getName();
HAPolicyConfiguration haConfig = configuration.getHAPolicyConfiguration();
return haConfig == null ? null : haConfig.getType().getName();
}
@Override

2
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java
View File

@ -240,6 +240,8 @@ public class ActiveMQServerControlTest extends ManagementTestBase {
assertEquals(conf.getJournalCompactPercentage(), serverControl.getJournalCompactPercentage());
assertEquals(conf.isPersistenceEnabled(), serverControl.isPersistenceEnabled());
assertEquals(conf.getJournalPoolFiles(), serverControl.getJournalPoolFiles());
assertEquals(null, conf.getHAPolicyConfiguration());
assertEquals(conf.getHAPolicyConfiguration(), serverControl.getHAPolicy());
assertTrue(serverControl.isActive());
}