GH-249 getAllEngineInstances() can return collection with null elements

(cherry picked from commit 6377e2b)
oracle · Nov 9, 2020 · f7f67c3 · f7f67c3
1 parent 7dd6012
commit f7f67c3
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/visualvm/sampler.truffle/libsrc/org/graalvm/visualvm/sampler/truffle/stagent/Truffle.java b/visualvm/sampler.truffle/libsrc/org/graalvm/visualvm/sampler/truffle/stagent/Truffle.java
@@ -213,6 +213,7 @@ private Collection<CPUSampler> getAllStackTracesInstances() {
         Collection<Engine> all = getAllEngineInstances();
 
         for (Engine engine : all) {
+            if (engine == null) continue;
             CPUSampler sampler = CPUSampler.find(engine);
 
             if (sampler != null) {
@@ -251,6 +252,7 @@ private Collection<HeapMonitor> getAllHeapHistogramInstances() {
         Collection<Engine> all = getAllEngineInstances();
 
         for (Engine engine : all) {
+            if (engine == null) continue;
             HeapMonitor heapHisto = HeapMonitor.find(engine);
 
             if (heapHisto != null) {
@@ -333,6 +335,7 @@ private void setMode(Mode m) {
         Collection<Engine> all = getAllEngineInstances();
 
         for (Engine engine : all) {
+            if (engine == null) continue;
             CPUSampler sampler = CPUSampler.find(engine);
 
             if (sampler != null) {