From ebbecb1b63493e47e7ad3a4d49698564ae1ac99a Mon Sep 17 00:00:00 2001
From: Dmitry Samersoff <dsamersoff@openjdk.org>
Date: Thu, 21 Apr 2016 13:18:46 +0300
Subject: [PATCH] 8143921:
 nsk/jdi/ObjectReference/waitingThreads/waitingthreads003 fails with
 JVMTI_ERROR_INVALID_CLASS

Skip invalid classes

Reviewed-by: sspitsyn
---
 .../share/native/libjdwp/VirtualMachineImpl.c          | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/VirtualMachineImpl.c b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/VirtualMachineImpl.c
index 2718ad1e3a4..8e1639c5e2e 100644
--- a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/VirtualMachineImpl.c
+++ b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/VirtualMachineImpl.c
@@ -126,7 +126,7 @@ classesForSignature(PacketInputStream *in, PacketOutputStream *out)
             int writtenCount = 0;
             int i;
 
-            for (i=0; i<classCount; i++) {
+            for (i = 0; i < classCount; i++) {
                 jclass clazz = theClasses[i];
                 jint status = classStatus(clazz);
                 char *candidate_signature = NULL;
@@ -141,7 +141,13 @@ classesForSignature(PacketInputStream *in, PacketOutputStream *out)
 
                 error = classSignature(clazz, &candidate_signature, NULL);
                 if (error != JVMTI_ERROR_NONE) {
-                    break;
+                  // Clazz become invalid since the time we get the class list
+                  // Skip this entry
+                  if (error == JVMTI_ERROR_INVALID_CLASS) {
+                    continue;
+                  }
+
+                  break;
                 }
 
                 if (strcmp(candidate_signature, signature) == 0) {