Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-19651 Remove LimitInputStream; AMENDMENT: fix compile

This commit is contained in:
Michael Stack 2018-01-05 17:28:40 -06:00
parent 88c7493948
commit ce80e8e38f
No known key found for this signature in database
GPG Key ID: 9816C7FC8ACC93D2
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.java
View File

@ -351,11 +351,7 @@ public class ProtobufLogReader extends ReaderBase {
"inputStream.available()= " + this.inputStream.available() + ", " + "inputStream.available()= " + this.inputStream.available() + ", " +
"entry size= " + size + " at offset = " + this.inputStream.getPos()); "entry size= " + size + " at offset = " + this.inputStream.getPos());
} }
<<<<<<< HEAD
ProtobufUtil.mergeFrom(builder, new BoundedInputStream(this.inputStream, size),
=======
ProtobufUtil.mergeFrom(builder, ByteStreams.limit(this.inputStream, size), ProtobufUtil.mergeFrom(builder, ByteStreams.limit(this.inputStream, size),
>>>>>>> a30d9fe8d9... HBASE-19651 Remove LimitInputStream
(int)size); (int)size);
} catch (InvalidProtocolBufferException ipbe) { } catch (InvalidProtocolBufferException ipbe) {
throw (EOFException) new EOFException("Invalid PB, EOF? Ignoring; originalPosition=" + throw (EOFException) new EOFException("Invalid PB, EOF? Ignoring; originalPosition=" +