| commit | 13cd3f2bfcdd8d680bdbd12abf2057df38299d18 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Feb 27 16:59:35 2018 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Feb 27 16:59:35 2018 +0000 |
| tree | 12a4e22b22bf9a092645eba623e4a8f7845f8d86 | |
| parent | fa76b40107a86a26d13aeb6221dc4498a0f3c5b6 [diff] | |
| parent | 79cf3db41dbe8ff01463ed83437031e4d672d9f3 [diff] |
Merge "Make StreamRedirector try to exhaust itself before exiting"
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/EnableCollectionDebuggee.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/EnableCollectionDebuggee.java index 6f5da51..8d33430 100644 --- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/EnableCollectionDebuggee.java +++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/EnableCollectionDebuggee.java
@@ -58,9 +58,7 @@ } int numberOfExpectedFinalizations = 2; - if (messageFromTest.equals(JPDADebuggeeSynchronizer.SGNL_CONTINUE + "1")) { - numberOfExpectedFinalizations = 1; - } else if (!messageFromTest.equals(JPDADebuggeeSynchronizer.SGNL_CONTINUE)) { + if (!messageFromTest.equals(JPDADebuggeeSynchronizer.SGNL_CONTINUE)) { logWriter.println("--> Unexpected message: \"" + messageFromTest + "\""); return; }
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/EnableCollectionTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/EnableCollectionTest.java index 16b6eef..0df0c1a 100644 --- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/EnableCollectionTest.java +++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/EnableCollectionTest.java
@@ -132,7 +132,7 @@ logWriter.println("=> Send to Debuggee signal to continue and try to unload checked ObjectID..."); finalSyncMessage = null; - synchronizer.sendMessage(JPDADebuggeeSynchronizer.SGNL_CONTINUE + "1"); // flag value + synchronizer.sendMessage(JPDADebuggeeSynchronizer.SGNL_CONTINUE); String messageFromDebuggee = synchronizer.receiveMessage(); logWriter.println ("\n=> Received message from Debuggee = \"" + messageFromDebuggee + "\"" );