Repository: qpid-jms Updated Branches: refs/heads/master 2e0500594 -> dd00b90e5
Fix potential NPE Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/dd00b90e Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/dd00b90e Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/dd00b90e Branch: refs/heads/master Commit: dd00b90e52d7583f57af0d3ff056864d48a86a28 Parents: 2e05005 Author: Timothy Bish <tabish...@gmail.com> Authored: Mon Oct 6 10:13:40 2014 -0400 Committer: Timothy Bish <tabish...@gmail.com> Committed: Mon Oct 6 10:13:40 2014 -0400 ---------------------------------------------------------------------- .../src/main/java/org/apache/qpid/jms/JmsDestination.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/dd00b90e/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsDestination.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsDestination.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsDestination.java index a736ed6..4874402 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsDestination.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsDestination.java @@ -139,7 +139,7 @@ public abstract class JmsDestination extends JNDIStorable implements JmsResource JmsDestination other = (JmsDestination) o; if (name == null && other.name != null) { return false; - } else if (!name.equals(other.name)) { + } else if (name != null && !name.equals(other.name)) { return false; } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
