From da63df46822375f2f6b731f0aa5791832accffe1 Mon Sep 17 00:00:00 2001
From: Paul Ferraro <paul.ferraro@redhat.com>
Date: Tue, 26 Mar 2019 10:10:31 -0400
Subject: [PATCH] WFLY-11910 Upgrade Infinispan to 9.4.11.Final

---
 .../ClientThreadPoolServiceConfigurator.java  | 26 +++++++++++++------
 pom.xml                                       |  2 +-
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/remote/ClientThreadPoolServiceConfigurator.java b/clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/remote/ClientThreadPoolServiceConfigurator.java
index 6c12ae4f0efc..52916f0e6221 100644
--- a/clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/remote/ClientThreadPoolServiceConfigurator.java
+++ b/clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/remote/ClientThreadPoolServiceConfigurator.java
@@ -30,6 +30,7 @@
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import org.infinispan.client.hotrod.configuration.ConfigurationBuilder;
 import org.infinispan.client.hotrod.configuration.ExecutorFactoryConfiguration;
@@ -47,7 +48,7 @@
 /**
  * @author Radoslav Husar
  */
-public class ClientThreadPoolServiceConfigurator extends ComponentServiceConfigurator<ExecutorFactoryConfiguration> implements ThreadFactory {
+public class ClientThreadPoolServiceConfigurator extends ComponentServiceConfigurator<ExecutorFactoryConfiguration> {
 
     private final ThreadPoolDefinition definition;
 
@@ -68,9 +69,9 @@ public ServiceConfigurator configure(OperationContext context, ModelNode model)
         this.factory = new ExecutorFactory() {
             @Override
             public ExecutorService getExecutor(Properties property) {
-                ThreadFactory clThreadFactory = new ClassLoaderThreadFactory(ClientThreadPoolServiceConfigurator.this, AccessController.doPrivileged((PrivilegedAction<ClassLoader>) ClassLoaderThreadFactory.class::getClassLoader));
+                ThreadFactory factory = new ClassLoaderThreadFactory(new DaemonThreadFactory(DefaultAsyncExecutorFactory.THREAD_NAME), AccessController.doPrivileged((PrivilegedAction<ClassLoader>) ClassLoaderThreadFactory.class::getClassLoader));
 
-                return new ThreadPoolExecutor(minThreads, maxThreads, keepAliveTime, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>(queueLength), clThreadFactory);
+                return new ThreadPoolExecutor(minThreads, maxThreads, keepAliveTime, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>(queueLength), factory);
             }
         };
 
@@ -82,11 +83,20 @@ public ExecutorFactoryConfiguration get() {
         return new ConfigurationBuilder().asyncExecutorFactory().factory(this.factory).create();
     }
 
-    @Override
-    public Thread newThread(Runnable task) {
-        Thread thread = new Thread(task, DefaultAsyncExecutorFactory.THREAD_NAME + "-" + DefaultAsyncExecutorFactory.counter.getAndIncrement());
-        thread.setDaemon(true);
-        return thread;
+    private static class DaemonThreadFactory implements ThreadFactory {
+        private final AtomicInteger index = new AtomicInteger(0);
+        private final String name;
+
+        DaemonThreadFactory(String name) {
+            this.name = name;
+        }
+
+        @Override
+        public Thread newThread(Runnable task) {
+            Thread thread = new Thread(task, String.join("-", this.name, String.valueOf(this.index.getAndIncrement())));
+            thread.setDaemon(true);
+            return thread;
+        }
     }
 }
 
diff --git a/pom.xml b/pom.xml
index c39e896292c6..5da4412d8911 100644
--- a/pom.xml
+++ b/pom.xml
@@ -307,7 +307,7 @@
         <version.org.hibernate.search>5.10.5.Final</version.org.hibernate.search>
         <version.org.hibernate.validator>6.0.16.Final</version.org.hibernate.validator>
         <version.org.hornetq>2.4.7.Final</version.org.hornetq>
-        <version.org.infinispan>9.4.8.Final</version.org.infinispan>
+        <version.org.infinispan>9.4.11.Final</version.org.infinispan>
         <version.org.jasypt>1.9.2</version.org.jasypt>
         <version.org.javassist>3.23.1-GA</version.org.javassist>
         <version.org.jberet>1.3.3.Final</version.org.jberet>