You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2018/06/06 19:24:45 UTC
[1/2] activemq-artemis git commit: ARTEMIS-1914 Fix NPE on
ConfigurationImpl.hashCode()
Repository: activemq-artemis
Updated Branches:
refs/heads/master 46a41aeca -> 6322e30d4
ARTEMIS-1914 Fix NPE on ConfigurationImpl.hashCode()
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/1d89bc7d
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/1d89bc7d
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/1d89bc7d
Branch: refs/heads/master
Commit: 1d89bc7dd279b6741b7ff276f2230aaab60f0db8
Parents: 46a41ae
Author: Andrey Arkaev <aa...@naumen.ru>
Authored: Wed Jun 6 18:08:15 2018 +0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Jun 6 15:19:15 2018 -0400
----------------------------------------------------------------------
.../activemq/artemis/core/config/impl/ConfigurationImpl.java | 2 +-
.../artemis/core/config/impl/ConfigurationImplTest.java | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/1d89bc7d/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java
index ae02dcd..ae4a25f 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java
@@ -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;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/1d89bc7d/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImplTest.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImplTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImplTest.java
index 58283b3..ca28e35 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImplTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImplTest.java
@@ -89,6 +89,13 @@ public class ConfigurationImplTest extends ActiveMQTestBase {
}
@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++) {
int i = RandomUtil.randomInt();
[2/2] activemq-artemis git commit: This closes #2124
Posted by cl...@apache.org.
This closes #2124
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/6322e30d
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/6322e30d
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/6322e30d
Branch: refs/heads/master
Commit: 6322e30d4a87b93bf9f9f017313b173538da2ce8
Parents: 46a41ae 1d89bc7
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed Jun 6 15:20:12 2018 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Jun 6 15:20:12 2018 -0400
----------------------------------------------------------------------
.../activemq/artemis/core/config/impl/ConfigurationImpl.java | 2 +-
.../artemis/core/config/impl/ConfigurationImplTest.java | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------