From 476bed589861fa5363e8dca27fee70dcf8b5dff5 Mon Sep 17 00:00:00 2001
From: Stefan Feuerhahn <stefan.feuerhahn@beanit.com>
Date: Tue, 21 Jan 2020 14:38:38 +0100
Subject: [PATCH] renamed thread factory

---
 src/main/java/com/beanit/jositransport/ServerThread.java  | 4 ++--
 .../java/com/beanit/openiec61850/ServerAssociation.java   | 4 ++--
 ...dDefaultThreadFactory.java => NamedThreadFactory.java} | 8 +++-----
 3 files changed, 7 insertions(+), 9 deletions(-)
 rename src/main/java/com/beanit/openiec61850/internal/{NamedDefaultThreadFactory.java => NamedThreadFactory.java} (80%)

diff --git a/src/main/java/com/beanit/jositransport/ServerThread.java b/src/main/java/com/beanit/jositransport/ServerThread.java
index 29e8a49..cf7e349 100644
--- a/src/main/java/com/beanit/jositransport/ServerThread.java
+++ b/src/main/java/com/beanit/jositransport/ServerThread.java
@@ -13,7 +13,7 @@
  */
 package com.beanit.jositransport;
 
-import com.beanit.openiec61850.internal.NamedDefaultThreadFactory;
+import com.beanit.openiec61850.internal.NamedThreadFactory;
 import java.io.IOException;
 import java.net.ServerSocket;
 import java.net.Socket;
@@ -58,7 +58,7 @@ final class ServerThread extends Thread {
   public void run() {
 
     ExecutorService executor =
-        Executors.newCachedThreadPool(new NamedDefaultThreadFactory("openiec61850-osi-server"));
+        Executors.newCachedThreadPool(new NamedThreadFactory("openiec61850-osi-server"));
     try {
 
       Socket clientSocket = null;
diff --git a/src/main/java/com/beanit/openiec61850/ServerAssociation.java b/src/main/java/com/beanit/openiec61850/ServerAssociation.java
index 0f2a63c..217edde 100644
--- a/src/main/java/com/beanit/openiec61850/ServerAssociation.java
+++ b/src/main/java/com/beanit/openiec61850/ServerAssociation.java
@@ -21,7 +21,7 @@ import com.beanit.josistack.AcseAssociation;
 import com.beanit.josistack.ByteBufferInputStream;
 import com.beanit.josistack.DecodingException;
 import com.beanit.openiec61850.internal.BerBoolean;
-import com.beanit.openiec61850.internal.NamedDefaultThreadFactory;
+import com.beanit.openiec61850.internal.NamedThreadFactory;
 import com.beanit.openiec61850.internal.mms.asn1.AccessResult;
 import com.beanit.openiec61850.internal.mms.asn1.ConfirmedErrorPDU;
 import com.beanit.openiec61850.internal.mms.asn1.ConfirmedRequestPDU;
@@ -115,7 +115,7 @@ final class ServerAssociation {
     serverModel = serverSap.serverModel;
     executor =
         Executors.newScheduledThreadPool(
-            2, new NamedDefaultThreadFactory("openiec61850-server-connection"));
+            2, new NamedThreadFactory("openiec61850-server-connection"));
   }
 
   private static void insertMmsRef(ModelNode node, List<String> mmsRefs, String parentRef) {
diff --git a/src/main/java/com/beanit/openiec61850/internal/NamedDefaultThreadFactory.java b/src/main/java/com/beanit/openiec61850/internal/NamedThreadFactory.java
similarity index 80%
rename from src/main/java/com/beanit/openiec61850/internal/NamedDefaultThreadFactory.java
rename to src/main/java/com/beanit/openiec61850/internal/NamedThreadFactory.java
index 2fcb320..56a9e27 100644
--- a/src/main/java/com/beanit/openiec61850/internal/NamedDefaultThreadFactory.java
+++ b/src/main/java/com/beanit/openiec61850/internal/NamedThreadFactory.java
@@ -13,15 +13,13 @@
  */
 package com.beanit.openiec61850.internal;
 
-import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.atomic.AtomicInteger;
 
-public class NamedDefaultThreadFactory implements ThreadFactory {
+public class NamedThreadFactory implements ThreadFactory {
 
   private final AtomicInteger threadCounter = new AtomicInteger(1);
   private final String namePrefix;
-  private ThreadFactory backingDefaultThreadFactory = Executors.defaultThreadFactory();
 
   /**
    * Creates a thread factory with the given pool name as a name prefix. Threads created will have
@@ -30,13 +28,13 @@ public class NamedDefaultThreadFactory implements ThreadFactory {
    *
    * @param poolName the thread pool name
    */
-  public NamedDefaultThreadFactory(String poolName) {
+  public NamedThreadFactory(String poolName) {
     this.namePrefix = poolName + "-thread-";
   }
 
   @Override
   public Thread newThread(Runnable r) {
-    Thread thread = backingDefaultThreadFactory.newThread(r);
+    Thread thread = new Thread(r);
     thread.setName(namePrefix + threadCounter.getAndIncrement());
     return thread;
   }