[avro] branch master updated: [AVRO-813] Keep the InputStream contract of -1 for eof Patch from Bruno Dumon applied

[dkulp]

This is an automated email from the ASF dual-hosted git repository.

dkulp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/avro.git


The following commit(s) were added to refs/heads/master by this push:
     new a5e0f4a  [AVRO-813] Keep the InputStream contract of -1 for eof Patch 
from Bruno Dumon applied
a5e0f4a is described below

commit a5e0f4ad01703eb4a724e71dfcf99306819c6bf3
Author: Daniel Kulp <dk...@apache.org>
AuthorDate: Mon Apr 1 16:53:02 2019 -0400

    [AVRO-813] Keep the InputStream contract of -1 for eof
    Patch from Bruno Dumon applied
---
 .../org/apache/avro/util/ByteBufferInputStream.java | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git 
a/lang/java/avro/src/main/java/org/apache/avro/util/ByteBufferInputStream.java 
b/lang/java/avro/src/main/java/org/apache/avro/util/ByteBufferInputStream.java
index 6647a87..f4c0087 100644
--- 
a/lang/java/avro/src/main/java/org/apache/avro/util/ByteBufferInputStream.java
+++ 
b/lang/java/avro/src/main/java/org/apache/avro/util/ByteBufferInputStream.java
@@ -18,7 +18,6 @@
 
 package org.apache.avro.util;
 
-import java.io.EOFException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.ByteBuffer;
@@ -35,22 +34,27 @@ public class ByteBufferInputStream extends InputStream {
 
   /**
    * @see InputStream#read()
-   * @throws EOFException if EOF is reached.
    */
   @Override
   public int read() throws IOException {
-    return getBuffer().get() & 0xff;
+    ByteBuffer buffer = getBuffer();
+    if (buffer == null) {
+      return -1;
+    }
+    return buffer.get() & 0xff;
   }
 
   /**
    * @see InputStream#read(byte[], int, int)
-   * @throws EOFException if EOF is reached before reading all the bytes.
    */
   @Override
   public int read(byte[] b, int off, int len) throws IOException {
     if (len == 0)
       return 0;
     ByteBuffer buffer = getBuffer();
+    if (buffer == null) {
+      return -1;
+    }
     int remaining = buffer.remaining();
     if (len > remaining) {
       buffer.get(b, off, remaining);
@@ -63,13 +67,14 @@ public class ByteBufferInputStream extends InputStream {
 
   /**
    * Read a buffer from the input without copying, if possible.
-   * 
-   * @throws EOFException if EOF is reached before reading all the bytes.
    */
   public ByteBuffer readBuffer(int length) throws IOException {
     if (length == 0)
       return ByteBuffer.allocate(0);
     ByteBuffer buffer = getBuffer();
+    if (buffer == null) {
+      return ByteBuffer.allocate(0);
+    }
     if (buffer.remaining() == length) { // can return current as-is?
       current++;
       return buffer; // return w/o copying
@@ -84,8 +89,6 @@ public class ByteBufferInputStream extends InputStream {
 
   /**
    * Returns the next non-empty buffer.
-   * 
-   * @throws EOFException if EOF is reached before reading all the bytes.
    */
   private ByteBuffer getBuffer() throws IOException {
     while (current < buffers.size()) {
@@ -94,6 +97,6 @@ public class ByteBufferInputStream extends InputStream {
         return buffer;
       current++;
     }
-    throw new EOFException();
+    return null;
   }
 }