From c3aec4d077220aef22f369c6d6ee692205b75a47 Mon Sep 17 00:00:00 2001
From: Sergey Matvienko <smatvienko@thingsboard.io>
Date: Fri, 7 May 2021 15:59:42 +0300
Subject: [PATCH] revert initDispatcherExecutor

---
 .../server/actors/service/DefaultActorService.java    | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/application/src/main/java/org/thingsboard/server/actors/service/DefaultActorService.java b/application/src/main/java/org/thingsboard/server/actors/service/DefaultActorService.java
index 6f359c00b0..98f739a24b 100644
--- a/application/src/main/java/org/thingsboard/server/actors/service/DefaultActorService.java
+++ b/application/src/main/java/org/thingsboard/server/actors/service/DefaultActorService.java
@@ -102,7 +102,16 @@ public class DefaultActorService extends TbApplicationEventListener<PartitionCha
     }
 
     private ExecutorService initDispatcherExecutor(String dispatcherName, int poolSize) {
-        return Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors() + 1, ThingsBoardThreadFactory.forName(dispatcherName));
+        if (poolSize == 0) {
+            int cores = Runtime.getRuntime().availableProcessors();
+            poolSize = Math.max(1, cores / 2);
+        }
+        if (poolSize == 1) {
+            return Executors.newSingleThreadExecutor(ThingsBoardThreadFactory.forName(dispatcherName));
+        } else {
+            return ThingsBoardExecutors.newWorkStealingPool(poolSize, dispatcherName);
+        }
+        //return Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors() + 1, ThingsBoardThreadFactory.forName(dispatcherName));
     }
 
     @EventListener(ApplicationReadyEvent.class)