diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2018-02-28 08:28:32 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-02-28 08:28:32 +0000 |
commit | e970e4863d88cd138d599ccb631f2cd08bee3864 (patch) | |
tree | 12a4e22b22bf9a092645eba623e4a8f7845f8d86 | |
parent | d31361a465087faedeffc2b4521a189f4790826e (diff) | |
parent | dc04857472fc5b29349b4e9d5e0fd788154fb4c5 (diff) | |
download | apache-harmony-pie-r2-release.tar.gz |
Snap for 4625912 from dc04857472fc5b29349b4e9d5e0fd788154fb4c5 to pi-releaseandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-platform-releasepie-gsipie-cuttlefish-testingpie-cts-release
Change-Id: Ia15e7e16ed1fe4dcd2f806cb5ad23e8b0d4d5c3c
-rw-r--r-- | jdwp/src/test/java/org/apache/harmony/jpda/tests/framework/StreamRedirector.java | 32 |
1 files changed, 21 insertions, 11 deletions
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/framework/StreamRedirector.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/framework/StreamRedirector.java index 56fefee..ca2ebc0 100644 --- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/framework/StreamRedirector.java +++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/framework/StreamRedirector.java @@ -26,9 +26,9 @@ package org.apache.harmony.jpda.tests.framework; import java.io.InputStreamReader; -import java.io.BufferedReader; import java.io.InputStream; import java.io.IOException; +import java.io.Reader; /** * <p>This class provides redirection of debuggee output and error streams to logWriter. @@ -37,7 +37,7 @@ public class StreamRedirector extends Thread { String name; LogWriter logWriter; - BufferedReader br; + Reader br; boolean doExit; /** @@ -51,8 +51,7 @@ public class StreamRedirector extends Thread { super("Redirector for " + name); this.name = name; this.logWriter = logWriter; - InputStreamReader isr = new InputStreamReader(is); - br = new BufferedReader(isr, 1024); + br = new InputStreamReader(is); doExit = false; } @@ -63,19 +62,30 @@ public class StreamRedirector extends Thread { public void run() { logWriter.println("Redirector started: " + name); try { - String line = ""; - while (!doExit) { + StringBuilder cur = new StringBuilder(); + while (!doExit || br.ready()) { try { - line = br.readLine(); - if (line == null) + int nc = br.read(); + if (nc == -1) { + if (cur.length() != 0) { + logWriter.println(name + "> " + cur.toString()); + cur.setLength(0); + } break; - - logWriter.println(name + "> " + line); + } else if (nc == (int)'\n') { + logWriter.println(name + "> " + cur.toString()); + cur.setLength(0); + } else { + cur.appendCodePoint(nc); + } } catch (IllegalStateException e) { //logWriter.printError("Illegal state exception! " + e); //ignore } - + } + if (cur.length() != 0) { + logWriter.println(name + "> " + cur.toString()); + cur.setLength(0); } logWriter.println("Redirector completed: " + name); } catch (IOException e) { |