fix: Prevents an NPE.

The NPE might have been introduced in e66afe1
jitsi · Oct 7, 2021 · 7f66d55 · 7f66d55
1 parent 0709bbc
commit 7f66d55
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/test/java/org/jitsi/meet/test/base/AbstractBaseTest.java b/src/test/java/org/jitsi/meet/test/base/AbstractBaseTest.java
@@ -367,7 +367,10 @@ public void closeParticipant(P participant)
     @AfterClass
     public void cleanupClass()
     {
-        this.participants.cleanup();
+        if (this.participants != null)
+        {
+            this.participants.cleanup();
+        }
     }
 
     @BeforeMethod

diff --git a/src/test/java/org/jitsi/meet/test/base/ParticipantHelper.java b/src/test/java/org/jitsi/meet/test/base/ParticipantHelper.java
@@ -190,8 +190,13 @@ public P get(int index)
      */
     public void cleanup()
     {
-        participants.stream().forEach(Participant::closeSafely);
-        participants.clear();
+        if (participants != null)
+        {
+            participants.stream()
+                .filter(participant -> participant != null)
+                .forEach(Participant::closeSafely);
+            participants.clear();
+        }
     }
 
     /**