Repository: qpid-jms Updated Branches: refs/heads/master 58b48e5a8 -> 0e5b55bd1
Fix more issues from FindBugs Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/71055421 Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/71055421 Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/71055421 Branch: refs/heads/master Commit: 71055421f869d3331c1f74ca3484531a6dab830b Parents: 58b48e5 Author: Timothy Bish <tabish...@gmail.com> Authored: Thu Oct 2 16:40:16 2014 -0400 Committer: Timothy Bish <tabish...@gmail.com> Committed: Thu Oct 2 16:40:16 2014 -0400 ---------------------------------------------------------------------- .../org/apache/qpid/jms/JmsPrefetchPolicy.java | 34 ++++++++++++++++---- .../apache/qpid/jms/meta/JmsConnectionInfo.java | 11 +++---- .../apache/qpid/jms/meta/JmsConsumerInfo.java | 11 +++---- .../apache/qpid/jms/meta/JmsProducerInfo.java | 11 +++---- .../qpid/jms/meta/JmsTransactionInfo.java | 11 +++---- 5 files changed, 48 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/71055421/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsPrefetchPolicy.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsPrefetchPolicy.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsPrefetchPolicy.java index c1212f2..1b99d04 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsPrefetchPolicy.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsPrefetchPolicy.java @@ -162,13 +162,35 @@ public class JmsPrefetchPolicy extends Object implements Serializable { } @Override - public boolean equals(Object object) { - if (object instanceof JmsPrefetchPolicy) { - JmsPrefetchPolicy other = (JmsPrefetchPolicy) object; - return this.queuePrefetch == other.queuePrefetch && this.queueBrowserPrefetch == other.queueBrowserPrefetch - && this.topicPrefetch == other.topicPrefetch && this.durableTopicPrefetch == other.durableTopicPrefetch; + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + durableTopicPrefetch; + result = prime * result + maxPrefetchSize; + result = prime * result + queueBrowserPrefetch; + result = prime * result + queuePrefetch; + result = prime * result + topicPrefetch; + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; } - return false; + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + + JmsPrefetchPolicy other = (JmsPrefetchPolicy) obj; + + return this.queuePrefetch == other.queuePrefetch && + this.queueBrowserPrefetch == other.queueBrowserPrefetch && + this.topicPrefetch == other.topicPrefetch && + this.durableTopicPrefetch == other.durableTopicPrefetch; } private int getMaxPrefetchLimit(int value) { http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/71055421/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsConnectionInfo.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsConnectionInfo.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsConnectionInfo.java index efdc6eb..d5e7677 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsConnectionInfo.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsConnectionInfo.java @@ -214,7 +214,7 @@ public final class JmsConnectionInfo implements JmsResource, Comparable<JmsConne @Override public int hashCode() { - return this.connectionId.hashCode(); + return (connectionId == null) ? super.hashCode() : connectionId.hashCode(); } @Override @@ -231,12 +231,11 @@ public final class JmsConnectionInfo implements JmsResource, Comparable<JmsConne JmsConnectionInfo other = (JmsConnectionInfo) obj; - if (connectionId == null && other.connectionId != null) { - return false; - } else if (!connectionId.equals(other.connectionId)) { - return false; + if (connectionId != null) { + return connectionId.equals(other.connectionId); } - return true; + + return false; } @Override http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/71055421/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsConsumerInfo.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsConsumerInfo.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsConsumerInfo.java index 2747453..3bc8027 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsConsumerInfo.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsConsumerInfo.java @@ -150,7 +150,7 @@ public final class JmsConsumerInfo implements JmsResource, Comparable<JmsConsume @Override public int hashCode() { - return (consumerId == null) ? 0 : consumerId.hashCode(); + return (consumerId == null) ? super.hashCode() : consumerId.hashCode(); } @Override @@ -167,12 +167,11 @@ public final class JmsConsumerInfo implements JmsResource, Comparable<JmsConsume JmsConsumerInfo other = (JmsConsumerInfo) obj; - if (consumerId == null && other.consumerId != null) { - return false; - } else if (!consumerId.equals(other.consumerId)) { - return false; + if (consumerId != null) { + return consumerId.equals(other.consumerId); } - return true; + + return false; } @Override http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/71055421/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsProducerInfo.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsProducerInfo.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsProducerInfo.java index f9fd9b3..d38ba6c 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsProducerInfo.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsProducerInfo.java @@ -65,7 +65,7 @@ public final class JmsProducerInfo implements JmsResource, Comparable<JmsProduce @Override public int hashCode() { - return (producerId == null) ? 0 : producerId.hashCode(); + return (producerId == null) ? super.hashCode() : producerId.hashCode(); } @Override @@ -82,13 +82,12 @@ public final class JmsProducerInfo implements JmsResource, Comparable<JmsProduce JmsProducerInfo other = (JmsProducerInfo) obj; - if (producerId == null && other.producerId != null) { - return false; - } else if (!producerId.equals(other.producerId)) { - return false; + if (producerId != null) { + return producerId.equals(other.producerId); } - return true; + return false; + } @Override http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/71055421/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsTransactionInfo.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsTransactionInfo.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsTransactionInfo.java index 5fca50f..e4cdebd 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsTransactionInfo.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsTransactionInfo.java @@ -48,7 +48,7 @@ public final class JmsTransactionInfo implements JmsResource, Comparable<JmsTran @Override public int hashCode() { - return (transactionId == null) ? 0 : transactionId.hashCode(); + return (transactionId == null) ? super.hashCode() : transactionId.hashCode(); } @Override @@ -65,12 +65,11 @@ public final class JmsTransactionInfo implements JmsResource, Comparable<JmsTran JmsTransactionInfo other = (JmsTransactionInfo) obj; - if (transactionId == null && other.transactionId != null) { - return false; - } else if (!transactionId.equals(other.transactionId)) { - return false; + if (transactionId != null) { + return transactionId.equals(other.transactionId); } - return true; + + return false; } @Override --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
