From fd6bf2c7d027e98d61eff465a1648cde87e07d4e Mon Sep 17 00:00:00 2001
From: sonu sinha <sonu.sinha@trellix.com>
Date: Tue, 20 Sep 2022 17:29:27 +0530
Subject: [PATCH 1/2] Broker Executor Services Force Closure Removal

---
 src/main/java/com/opendxl/client/DxlClientConfig.java | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/main/java/com/opendxl/client/DxlClientConfig.java b/src/main/java/com/opendxl/client/DxlClientConfig.java
index 0de67eb..e5e390a 100644
--- a/src/main/java/com/opendxl/client/DxlClientConfig.java
+++ b/src/main/java/com/opendxl/client/DxlClientConfig.java
@@ -868,12 +868,8 @@ protected synchronized List<Broker> getSortedBrokerList(final Collection<Broker>
                 futures.add(connectToBroker(es, broker, brokerPingTimeout));
             }
         } finally {
-            es.shutdown();
             if (!es.awaitTermination(brokerPingTimeout * 5, TimeUnit.MILLISECONDS)) {
-                es.shutdownNow();
-                if (!es.awaitTermination(brokerPingTimeout * 5, TimeUnit.MILLISECONDS)) {
-                    logger.error("Error shutting down getSortedBrokerList executor service thread pool");
-                }
+                es.shutdown();
             }
         }
 

From 052a82bd127221f0c4d8515e936ca02f6c676f74 Mon Sep 17 00:00:00 2001
From: sonu sinha <sonu.sinha@trellix.com>
Date: Thu, 22 Sep 2022 18:51:24 +0530
Subject: [PATCH 2/2] Broker Executor Services Force Closure Removal

---
 README.md                                             | 4 ++--
 docs/prerequisites.rst                                | 4 ++--
 gradle.properties                                     | 2 +-
 src/main/java/com/opendxl/client/DxlClientConfig.java | 4 +++-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index b1d6c15..ad7bbea 100644
--- a/README.md
+++ b/README.md
@@ -36,12 +36,12 @@ Maven:
 <dependency>
   <groupId>com.opendxl</groupId>
   <artifactId>dxlclient</artifactId>
-  <version>0.2.6</version>
+  <version>0.2.8</version>
 </dependency>
 ```
 or Gradle:
 ```groovy
-compile 'com.opendxl:dxlclient:0.2.6'
+compile 'com.opendxl:dxlclient:0.2.8'
 ```
 
 ## Bugs and Feedback
diff --git a/docs/prerequisites.rst b/docs/prerequisites.rst
index 3bf48ce..8da267e 100644
--- a/docs/prerequisites.rst
+++ b/docs/prerequisites.rst
@@ -53,10 +53,10 @@ Maven:
         <dependency>
           <groupId>com.opendxl</groupId>
           <artifactId>dxlclient</artifactId>
-          <version>0.2.6</version>
+          <version>0.2.8</version>
         </dependency>
 or Gradle:
 
     .. code-block:: groovy
 
-        compile 'com.opendxl:dxlclient:0.2.6'
+        compile 'com.opendxl:dxlclient:0.2.8'
diff --git a/gradle.properties b/gradle.properties
index 8825b74..718c1ec 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1 +1 @@
-version=0.2.7-SNAPSHOT
+version=0.2.8
\ No newline at end of file
diff --git a/src/main/java/com/opendxl/client/DxlClientConfig.java b/src/main/java/com/opendxl/client/DxlClientConfig.java
index e5e390a..a7459cf 100644
--- a/src/main/java/com/opendxl/client/DxlClientConfig.java
+++ b/src/main/java/com/opendxl/client/DxlClientConfig.java
@@ -868,8 +868,10 @@ protected synchronized List<Broker> getSortedBrokerList(final Collection<Broker>
                 futures.add(connectToBroker(es, broker, brokerPingTimeout));
             }
         } finally {
+            es.shutdown();
             if (!es.awaitTermination(brokerPingTimeout * 5, TimeUnit.MILLISECONDS)) {
-                es.shutdown();
+                logger.info("Shutting down getSortedBrokerList executor service thread pool taking longer than "
+                        + brokerPingTimeout * 5 + "milliseconds");
             }
         }