From c66957867b3c88c0abaf8c5395ad983237ac44fa Mon Sep 17 00:00:00 2001
From: Greg Wilkins <gregw@webtide.com>
Date: Thu, 25 Apr 2019 06:13:30 +0200
Subject: [PATCH 1/3] Improve #3550 cleanup after review

Signed-off-by: Greg Wilkins <gregw@webtide.com>
---
 .../java/org/eclipse/jetty/util/thread/QueuedThreadPool.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/QueuedThreadPool.java b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/QueuedThreadPool.java
index 131bcd14f09..171aa8e0692 100755
--- a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/QueuedThreadPool.java
+++ b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/QueuedThreadPool.java
@@ -604,7 +604,7 @@ public class QueuedThreadPool extends ContainerLifeCycle implements SizedThreadP
             String knownMethod = "";
             for (StackTraceElement t : trace)
             {
-                if ("idleJobPoll".equals(t.getMethodName()) && t.getClassName().endsWith("QueuedThreadPool$Runner"))
+                if ("idleJobPoll".equals(t.getMethodName()) && t.getClassName().equals(Runner.class.getName()))
                 {
                     knownMethod = "IDLE ";
                     break;

From 41f9d7a95da0193bb250f9da0f8de855f2c04395 Mon Sep 17 00:00:00 2001
From: Jan Bartel <janb@webtide.com>
Date: Wed, 24 Apr 2019 14:20:05 +0200
Subject: [PATCH 2/3] Issue #3597 NPE in DumpableCollection

Signed-off-by: Jan Bartel <janb@webtide.com>
---
 .../util/component/DumpableCollection.java    |  4 +-
 .../component/DumpableCollectionTest.java     | 54 +++++++++++++++++++
 2 files changed, 56 insertions(+), 2 deletions(-)
 create mode 100644 jetty-util/src/test/java/org/eclipse/jetty/util/component/DumpableCollectionTest.java

diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/component/DumpableCollection.java b/jetty-util/src/main/java/org/eclipse/jetty/util/component/DumpableCollection.java
index a25af015b66..db1e755f26c 100644
--- a/jetty-util/src/main/java/org/eclipse/jetty/util/component/DumpableCollection.java
+++ b/jetty-util/src/main/java/org/eclipse/jetty/util/component/DumpableCollection.java
@@ -53,7 +53,7 @@ public class DumpableCollection implements Dumpable
     @Override
     public void dump(Appendable out, String indent) throws IOException
     {
-        Object[] array = _collection.toArray();
-        Dumpable.dumpObjects(out,indent,_name + " size="+array.length, array);
+        Object[] array = (_collection == null ? null : _collection.toArray());
+        Dumpable.dumpObjects(out,indent,_name + " size="+(array == null ? 0 : array.length), array);
     }
 }
diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/component/DumpableCollectionTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/component/DumpableCollectionTest.java
new file mode 100644
index 00000000000..ee696868d9b
--- /dev/null
+++ b/jetty-util/src/test/java/org/eclipse/jetty/util/component/DumpableCollectionTest.java
@@ -0,0 +1,54 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2019 Mort Bay Consulting Pty. Ltd.
+//  ------------------------------------------------------------------------
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+package org.eclipse.jetty.util.component;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.hamcrest.Matchers;
+import org.junit.jupiter.api.Test;
+
+public class DumpableCollectionTest
+{
+
+    @Test
+    public void testNullDumpableCollection () throws Exception
+    {
+        DumpableCollection dc = new DumpableCollection("null test", null);
+        String dump = dc.dump();
+        assertThat(dump, Matchers.containsString("size=0"));
+    }
+    
+    @Test
+    public void testNonNullDumpableCollection () throws Exception
+    {
+        Collection<String> collection = new ArrayList<>();
+        collection.add("one");
+        collection.add("two");
+        collection.add("three");
+        
+        DumpableCollection dc = new DumpableCollection("non null test", collection);
+        String dump = dc.dump();
+        assertThat(dump, Matchers.containsString("one"));
+        assertThat(dump, Matchers.containsString("two"));
+        assertThat(dump, Matchers.containsString("three"));
+    }
+}

From ab03504a2fc27bdfc5b4eddfb870ee26afd361cc Mon Sep 17 00:00:00 2001
From: Jan Bartel <janb@webtide.com>
Date: Fri, 19 Apr 2019 16:09:09 +1000
Subject: [PATCH 3/3] Issue #3573 Update bom for infinispan.

Signed-off-by: Jan Bartel <janb@webtide.com>
---
 jetty-bom/pom.xml | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/jetty-bom/pom.xml b/jetty-bom/pom.xml
index d5f8c5095c3..70e22eef8a2 100644
--- a/jetty-bom/pom.xml
+++ b/jetty-bom/pom.xml
@@ -211,7 +211,22 @@
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
-        <artifactId>jetty-infinispan</artifactId>
+        <artifactId>infinispan-remote</artifactId>
+        <version>9.4.17-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>infinispan-remote-query</artifactId>
+        <version>9.4.17-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>infinispan-embedded</artifactId>
+        <version>9.4.17-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>infinispan-embedded-query</artifactId>
         <version>9.4.17-SNAPSHOT</version>
       </dependency>
       <dependency>