summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-07-09 20:19:11 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2023-07-09 20:19:11 +0000
commit48b77c8fa9ff01c02bd29300e72d219b63cdfdee (patch)
treeac544fe31f42937c5e07fc31486377e04745ffdf
parent44b8397e2254d48c11bb047b85e9125a7b2b67f3 (diff)
parente3fb2c87aa4d221b224426229c6676c01524a8f3 (diff)
downloadapache-harmony-android12-tests-release.tar.gz
Merge "Snap for 10459544 from 70d02f260ca8085672d5b9565f095c1c351ed42f to android12-tests-release" into android12-tests-releaseandroid-vts-12.0_r9android-vts-12.0_r12android-vts-12.0_r11android-vts-12.0_r10android-cts-12.0_r9android-cts-12.0_r12android-cts-12.0_r11android-cts-12.0_r10android12-tests-release
-rw-r--r--jdwp/src/test/java/org/apache/harmony/jpda/tests/framework/jdwp/PacketDispatcher.java8
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)