diff options
| author | Fabien Sanglard <sanglardf@google.com> | 2022-12-16 01:13:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-12-16 01:13:01 +0000 |
| commit | 097f8eff8ec42bf3a9439e3229ec22d19b3f3bf9 (patch) | |
| tree | 8d6958a33410f391e4ee1c08cbbd9a057f53a0e7 | |
| parent | a63065e86ea8f5b64c699594d151d68ed124903d (diff) | |
| parent | 4fcd0e358265d763d9e64e518c0f5e3db6d16406 (diff) | |
| download | apache-harmony-097f8eff8ec42bf3a9439e3229ec22d19b3f3bf9.tar.gz | |
Merge "Fix event parsing"main-16k-with-phones
| -rw-r--r-- | jdwp/src/test/java/org/apache/harmony/jpda/tests/framework/jdwp/PacketDispatcher.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/framework/jdwp/PacketDispatcher.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/framework/jdwp/PacketDispatcher.java index feceb8f..8870845 100644 --- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/framework/jdwp/PacketDispatcher.java +++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/framework/jdwp/PacketDispatcher.java @@ -33,6 +33,7 @@ import java.util.Hashtable; import org.apache.harmony.jpda.tests.framework.LogWriter; import org.apache.harmony.jpda.tests.framework.TestOptions; +import org.apache.harmony.jpda.tests.framework.jdwp.JDWPCommands.EventCommandSet; import org.apache.harmony.jpda.tests.framework.jdwp.exceptions.TimeoutException; /** @@ -554,7 +555,12 @@ public class PacketDispatcher extends Thread { EventPacket eventPacket = new EventPacket(packet); // below is to check received events for correctness - // below is trace for received events + // Check this is indeed an Event (this could be a JDWP extension) + // If it is not, ignore it. + if (eventPacket.getCommandSet() != EventCommandSet.CommandSetID) { + continue; + } + ParsedEvent[] parsedEvents = ParsedEvent .parseEventPacket(eventPacket); if ((eventRequestIDForTrace >= 0) |