2 files changed, 11 insertions, 1 deletions
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/framework/jdwp/Packet.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/framework/jdwp/Packet.java
index ba88706..baa66e9 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/framework/jdwp/Packet.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/framework/jdwp/Packet.java
@@ -1252,6 +1252,10 @@ public class Packet {
         return reading_data_index == data.length;
     }
 
+    public int remainingData() {
+        return data.length - reading_data_index;
+    }
+
     /**
      * Writes value - val to the array of bytes ar[], beginning from index - to,
      * size of value is - size bytes. If size is less than 8, the appropriate
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)