You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by cn...@apache.org on 2013/09/27 20:32:18 UTC
svn commit: r1527023 -
/hadoop/common/branches/HDFS-4949/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/ElasticByteBufferPool.java
Author: cnauroth
Date: Fri Sep 27 18:32:18 2013
New Revision: 1527023
URL: http://svn.apache.org/r1527023
Log:
HDFS-5266. Addendum for addressing Findbugs warnings for lack of hashCode method and lack of null check in equals. Contributed by Chris Nauroth.
Modified:
hadoop/common/branches/HDFS-4949/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/ElasticByteBufferPool.java
Modified: hadoop/common/branches/HDFS-4949/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/ElasticByteBufferPool.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-4949/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/ElasticByteBufferPool.java?rev=1527023&r1=1527022&r2=1527023&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-4949/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/ElasticByteBufferPool.java (original)
+++ hadoop/common/branches/HDFS-4949/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/ElasticByteBufferPool.java Fri Sep 27 18:32:18 2013
@@ -18,6 +18,7 @@
package org.apache.hadoop.io;
import com.google.common.collect.ComparisonChain;
+import org.apache.commons.lang.builder.HashCodeBuilder;
import java.nio.ByteBuffer;
import java.util.Map;
@@ -55,6 +56,9 @@ public final class ElasticByteBufferPool
@Override
public boolean equals(Object rhs) {
+ if (rhs == null) {
+ return false;
+ }
try {
Key o = (Key)rhs;
return (compareTo(o) == 0);
@@ -62,6 +66,14 @@ public final class ElasticByteBufferPool
return false;
}
}
+
+ @Override
+ public int hashCode() {
+ return new HashCodeBuilder().
+ append(capacity).
+ append(insertionTime).
+ toHashCode();
+ }
}
private final TreeMap<Key, ByteBuffer> buffers =