Author: tedyu
Date: Mon Dec 30 14:37:50 2013
New Revision: 1554240
URL: http://svn.apache.org/r1554240
Log:
HBASE-10255 Remove dependency on LimitInputStream
Removed:
hbase/branches/0.98/hbase-common/src/main/java/org/apache/hadoop/hbase/io/LimitInputStream.java
Modified:
hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.java
Modified:
hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.java?rev=1554240&r1=1554239&r2=1554240&view=diff
==============================================================================
---
hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.java
(original)
+++
hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.java
Mon Dec 30 14:37:50 2013
@@ -25,13 +25,13 @@ import java.io.InputStream;
import java.nio.ByteBuffer;
import java.util.Arrays;
+import org.apache.commons.io.input.BoundedInputStream;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FSDataInputStream;
import org.apache.hadoop.hbase.codec.Codec;
-import org.apache.hadoop.hbase.io.LimitInputStream;
import org.apache.hadoop.hbase.protobuf.generated.WALProtos;
import org.apache.hadoop.hbase.protobuf.generated.WALProtos.WALHeader.Builder;
import org.apache.hadoop.hbase.protobuf.generated.WALProtos.WALKey;
@@ -226,7 +226,7 @@ public class ProtobufLogReader extends R
"inputStream.available()= " + this.inputStream.available() +
", " +
"entry size= " + size);
}
- final InputStream limitedInput = new
LimitInputStream(this.inputStream, size);
+ final InputStream limitedInput = new
BoundedInputStream(this.inputStream, size);
builder.mergeFrom(limitedInput);
} catch (InvalidProtocolBufferException ipbe) {
throw (EOFException) new EOFException("Invalid PB, EOF? Ignoring;
originalPosition=" +
