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

ARTEMIS-1914 Fix NPE on ConfigurationImpl.hashCode()

This commit is contained in:
Andrey Arkaev 2018-06-06 18:08:15 +05:00 committed by Clebert Suconic
parent 46a41aecad
commit 1d89bc7dd2
2 changed files with 8 additions and 1 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/config/impl/ConfigurationImpl.java
View File

@ -1635,7 +1635,7 @@ public class ConfigurationImpl implements Configuration, Serializable {
result = prime * result + (logJournalWriteRate ? 1231 : 1237);
result = prime * result + ((managementAddress == null) ? 0 : managementAddress.hashCode());
result = prime * result + ((managementNotificationAddress == null) ? 0 : managementNotificationAddress.hashCode());
result = prime * result + (maskPassword ? 1231 : 1237);
result = prime * result + (maskPassword == null ? 0 : maskPassword.hashCode());
result = prime * result + maxConcurrentPageIO;
result = prime * result + (int) (memoryMeasureInterval ^ (memoryMeasureInterval >>> 32));
result = prime * result + memoryWarningThreshold;

7
artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImplTest.java
View File

@ -88,6 +88,13 @@ public class ConfigurationImplTest extends ActiveMQTestBase {
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultMemoryMeasureInterval(), conf.getMemoryMeasureInterval());
}
@Test
public void testNullMaskPassword() {
ConfigurationImpl impl = new ConfigurationImpl();
impl.setMaskPassword(null);
impl.hashCode();
}
@Test
public void testSetGetAttributes() throws Exception {
for (int j = 0; j < 100; j++) {