From e1a6c1c43cb34b29a28afcbc81d2aee0f7683fc6 Mon Sep 17 00:00:00 2001
From: Volodymyr Babak <volodymyr.babak@gmail.com>
Date: Fri, 27 Nov 2020 17:42:56 +0200
Subject: [PATCH] Added shutdown of executor on destroy

---
 .../thingsboard/server/service/edge/rpc/EdgeGrpcService.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcService.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcService.java
index 7fc5121ff5..4a21c5aac7 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcService.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcService.java
@@ -117,6 +117,9 @@ public class EdgeGrpcService extends EdgeRpcServiceGrpc.EdgeRpcServiceImplBase i
         if (server != null) {
             server.shutdownNow();
         }
+        if (executor != null) {
+            executor.shutdownNow();
+        }
     }
 
     @Override