OF-1125: Fix StreamId equals() (#589)

baa79d57 · Guus der Kinderen · daryl herzmann · a6024d80 · baa79d57
Commit baa79d57 authored May 19, 2016 by Guus der Kinderen Committed by daryl herzmann May 19, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

BasicStreamIDFactory.java ...a/org/jivesoftware/openfire/spi/BasicStreamIDFactory.java +5 -2

No files found.
--- a/src/java/org/jivesoftware/openfire/spi/BasicStreamIDFactory.java
+++ b/src/java/org/jivesoftware/openfire/spi/BasicStreamIDFactory.java
@@ -80,8 +80,11 @@ public class BasicStreamIDFactory implements StreamIDFactory {
        }
        @Override
-        public boolean equals(Object obj) {
+        public boolean equals( Object o )
-            return id.equals( obj );
+        {
+            if ( this == o ) return true;
+            if ( o == null || getClass() != o.getClass() ) return false;
+            return id.equals( ((BasicStreamID) o).id );
        }
    }
 }