From be400d3ea8edfe822ef9c2d01f173a4760bcd574 Mon Sep 17 00:00:00 2001
From: Kun Zhang <zhangkun@google.com>
Date: Thu, 1 Oct 2015 15:13:03 -0700
Subject: [PATCH] Stub mockTransport.newStream() to prevent NPE.

---
 .../test/java/io/grpc/internal/ManagedChannelImplTest.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/src/test/java/io/grpc/internal/ManagedChannelImplTest.java b/core/src/test/java/io/grpc/internal/ManagedChannelImplTest.java
index 4d897dd86f..db4f4578fc 100644
--- a/core/src/test/java/io/grpc/internal/ManagedChannelImplTest.java
+++ b/core/src/test/java/io/grpc/internal/ManagedChannelImplTest.java
@@ -295,7 +295,11 @@ public class ManagedChannelImplTest {
   public void testNoDeadlockOnShutdown() {
     // Force creation of transport
     ClientCall<String, Integer> call = channel.newCall(method, CallOptions.DEFAULT);
-    call.start(mockCallListener, new Metadata());
+    Metadata headers = new Metadata();
+    ClientStream mockStream = mock(ClientStream.class);
+    when(mockTransport.newStream(same(method), same(headers), any(ClientStreamListener.class)))
+        .thenReturn(mockStream);
+    call.start(mockCallListener, headers);
     call.cancel();
 
     verify(mockTransport, timeout(1000)).start(transportListenerCaptor.capture());