grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix NPE in ProtoInputStream.drainTo 

Fixes #1225
This commit is contained in:
Eric Anderson 2016-02-01 15:16:17 -08:00
parent e475d388b9
commit 4573836df9
2 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
protobuf/src/main/java/io/grpc/protobuf/ProtoInputStream.java
View File

@ -70,9 +70,11 @@ class ProtoInputStream extends InputStream implements Drainable, KnownLength {
written = message.getSerializedSize();
message.writeTo(target);
message = null;
} else {
} else if (partial != null) {
written = (int) ByteStreams.copy(partial, target);
partial = null;
} else {
written = 0;
}
return written;
}

44
protobuf/src/test/java/io/grpc/protobuf/ProtoUtilsTest.java
View File

@ -41,6 +41,7 @@ import com.google.protobuf.Empty;
import com.google.protobuf.Enum;
import com.google.protobuf.Type;
import io.grpc.Drainable;
import io.grpc.MethodDescriptor.Marshaller;
import org.junit.Test;
@ -48,6 +49,7 @@ import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.Arrays;
@ -115,4 +117,46 @@ public class ProtoUtilsTest {
assertEquals(-1, is.read());
assertEquals(0, is.available());
}
@Test
public void testDrainTo_all() throws Exception {
byte[] golden = ByteStreams.toByteArray(marshaller.stream(proto));
InputStream is = marshaller.stream(proto);
Drainable d = (Drainable) is;
ByteArrayOutputStream baos = new ByteArrayOutputStream();
int drained = d.drainTo(baos);
assertEquals(baos.size(), drained);
assertArrayEquals(golden, baos.toByteArray());
assertEquals(0, is.available());
}
@Test
public void testDrainTo_partial() throws Exception {
final byte[] golden;
{
InputStream is = marshaller.stream(proto);
is.read();
golden = ByteStreams.toByteArray(is);
}
InputStream is = marshaller.stream(proto);
is.read();
Drainable d = (Drainable) is;
ByteArrayOutputStream baos = new ByteArrayOutputStream();
int drained = d.drainTo(baos);
assertEquals(baos.size(), drained);
assertArrayEquals(golden, baos.toByteArray());
assertEquals(0, is.available());
}
@Test
public void testDrainTo_none() throws Exception {
byte[] golden = ByteStreams.toByteArray(marshaller.stream(proto));
InputStream is = marshaller.stream(proto);
ByteStreams.toByteArray(is);
Drainable d = (Drainable) is;
ByteArrayOutputStream baos = new ByteArrayOutputStream();
assertEquals(0, d.drainTo(baos));
assertArrayEquals(new byte[0], baos.toByteArray());
assertEquals(0, is.available());
}
}