From e23a09414fcbe3eb074e3c770d72b57e966c07bf Mon Sep 17 00:00:00 2001 From: Bela Schaum Date: Fri, 25 Mar 2016 12:00:18 +0100 Subject: [PATCH] Update AdbHelper.java NPE --- ddms/libs/ddmlib/src/com/android/ddmlib/AdbHelper.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/AdbHelper.java b/ddms/libs/ddmlib/src/com/android/ddmlib/AdbHelper.java index 5b5a41f7..bb32195e 100644 --- a/ddms/libs/ddmlib/src/com/android/ddmlib/AdbHelper.java +++ b/ddms/libs/ddmlib/src/com/android/ddmlib/AdbHelper.java @@ -394,8 +394,11 @@ static void executeRemoteCommand(InetSocketAddress adbSockAddr, count = adbChan.read(buf); if (count < 0) { - // we're at the end, we flush the output - rcvr.flush(); + // we're at the end, we flush the output if exist + if(rcvr != null) { + rcvr.flush(); + } + Log.v("ddms", "execute '" + command + "' on '" + device + "' : EOF hit. Read: " + count); break;