Repository: jena Updated Branches: refs/heads/master 7e8d5f00c -> 43382fa07
Fix MultiMap.equals Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/db5557bb Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/db5557bb Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/db5557bb Branch: refs/heads/master Commit: db5557bb4baf3d49d04e46e79b1e310a53583eac Parents: 7e8d5f0 Author: Andy Seaborne <[email protected]> Authored: Tue Jan 20 09:25:50 2015 +0000 Committer: Andy Seaborne <[email protected]> Committed: Tue Jan 20 09:25:50 2015 +0000 ---------------------------------------------------------------------- .../org/apache/jena/atlas/lib/MultiMap.java | 21 +++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/db5557bb/jena-arq/src/main/java/org/apache/jena/atlas/lib/MultiMap.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/lib/MultiMap.java b/jena-arq/src/main/java/org/apache/jena/atlas/lib/MultiMap.java index 1e02028..2782ea6 100644 --- a/jena-arq/src/main/java/org/apache/jena/atlas/lib/MultiMap.java +++ b/jena-arq/src/main/java/org/apache/jena/atlas/lib/MultiMap.java @@ -96,13 +96,20 @@ public abstract class MultiMap<K, V> } @Override - public boolean equals(Object other) - { - if ( this == other ) return true ; - if ( ! ( other instanceof MultiMap<?,?> ) ) return true ; - @SuppressWarnings("unchecked") - MultiMap<K,V> mmap = (MultiMap<K,V>)other ; - return map.equals(mmap.map) ; + public boolean equals(Object obj) { + if ( this == obj ) + return true ; + if ( obj == null ) + return false ; + if ( getClass() != obj.getClass() ) + return false ; + MultiMap<?,?> other = (MultiMap<?,?>)obj ; + if ( map == null ) { + if ( other.map != null ) + return false ; + } else if ( !map.equals(other.map) ) + return false ; + return true ; } @Override
