--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaVM.java	Tue May 21 00:52:04 2019 -0700
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaVM.java	Tue May 21 10:34:57 2019 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -189,12 +189,12 @@
 
     private synchronized JSList getThreads() {
         if (threadsCache == null) {
-            List threads = new ArrayList(0);
-            threadsCache = factory.newJSList(threads);
-            JavaThread jthread = vm.getThreads().first();
-            while (jthread != null) {
-                threads.add(jthread);
-                jthread = jthread.next();
+            List threadsList = new ArrayList(0);
+            threadsCache = factory.newJSList(threadsList);
+            Threads threads = VM.getVM().getThreads();
+            for (int i = 0; i < threads.getNumberOfThreads(); i++) {
+                JavaThread thread = threads.getJavaThreadAt(i);
+                threadsList.add(thread);
             }
         }
         return threadsCache;