Author: cnauroth
Date: Thu Sep 26 20:30:14 2013
New Revision: 1526671
URL: http://svn.apache.org/r1526671
Log:
HDFS-5266. ElasticByteBufferPool#Key does not implement equals. Contributed by
Chris Nauroth.
Modified:
hadoop/common/branches/HDFS-4949/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/ByteBufferPool.java
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/ByteBufferPool.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-4949/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/ByteBufferPool.java?rev=1526671&r1=1526670&r2=1526671&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-4949/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/ByteBufferPool.java
(original)
+++
hadoop/common/branches/HDFS-4949/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/ByteBufferPool.java
Thu Sep 26 20:30:14 2013
@@ -31,7 +31,7 @@ public interface ByteBufferPool {
* new buffer.
*
* @param direct Whether the buffer should be direct.
- * @param minLength The minimum length the buffer will have.
+ * @param length The minimum length the buffer will have.
* @return A new ByteBuffer. This ByteBuffer must be direct.
* Its capacity can be less than what was requested, but
* must be at least 1 byte.
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=1526671&r1=1526670&r2=1526671&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
Thu Sep 26 20:30:14 2013
@@ -52,6 +52,16 @@ public final class ElasticByteBufferPool
compare(insertionTime, other.insertionTime).
result();
}
+
+ @Override
+ public boolean equals(Object rhs) {
+ try {
+ Key o = (Key)rhs;
+ return (compareTo(o) == 0);
+ } catch (ClassCastException e) {
+ return false;
+ }
+ }
}
private final TreeMap<Key, ByteBuffer> buffers =
