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 2017/07/24 19:24:40 UTC
activemq-artemis git commit: ARTEMIS-1257 Fixing hashCode
Repository: activemq-artemis
Updated Branches:
refs/heads/master 14fe149fa -> 08d8c08ed
ARTEMIS-1257 Fixing hashCode
ResourceAdapterTest had a few failures with a NPE
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/08d8c08e
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/08d8c08e
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/08d8c08e
Branch: refs/heads/master
Commit: 08d8c08ed3825d53666d774d0b919b6cd2caa545
Parents: 14fe149
Author: Clebert Suconic <cl...@apache.org>
Authored: Mon Jul 24 15:19:57 2017 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Jul 24 15:19:59 2017 -0400
----------------------------------------------------------------------
.../apache/activemq/artemis/ra/inflow/ActiveMQActivationSpec.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/08d8c08e/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivationSpec.java
----------------------------------------------------------------------
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivationSpec.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivationSpec.java
index 5cba26e..6b6eedc 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivationSpec.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivationSpec.java
@@ -897,7 +897,7 @@ public class ActiveMQActivationSpec extends ConnectionFactoryProperties implemen
result = 31 * result + acknowledgeMode;
result = 31 * result + (subscriptionDurability ? 1 : 0);
result = 31 * result + (subscriptionName != null ? subscriptionName.hashCode() : 0);
- result = 31 * result + (shareSubscriptions ? 1 : 0);
+ result = 31 * result + (shareSubscriptions != null && shareSubscriptions ? 1 : 0);
result = 31 * result + (user != null ? user.hashCode() : 0);
result = 31 * result + (password != null ? password.hashCode() : 0);
result = 31 * result + (maxSession != null ? maxSession.hashCode() : 0);