From 02311c8bbe85210fae047ca57ff8322096fb0edf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Aur=C3=A8le=20Brothier?= <m@brothier.org>
Date: Wed, 5 Apr 2017 12:25:17 +0200
Subject: [PATCH] Activate NioTest following changes in CLOUDSTACK-9348 PR
 #1549
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The first PR #1493 re-enabled the NioTest but not the new PR #1549.

Signed-off-by: Marc-Aurèle Brothier <m@brothier.org>
---
 utils/pom.xml                                              | 1 -
 utils/src/main/java/com/cloud/utils/nio/NioConnection.java | 5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/utils/pom.xml b/utils/pom.xml
index ae1bf23fe3c..c8ff0fb8182 100755
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -208,7 +208,6 @@
           <excludes>
             <exclude>com/cloud/utils/testcase/*TestCase*</exclude>
             <exclude>com/cloud/utils/db/*Test*</exclude>
-            <exclude>com/cloud/utils/testcase/NioTest.java</exclude>
           </excludes>
         </configuration>
       </plugin>
diff --git a/utils/src/main/java/com/cloud/utils/nio/NioConnection.java b/utils/src/main/java/com/cloud/utils/nio/NioConnection.java
index 630b2ddab76..ce032462ec2 100644
--- a/utils/src/main/java/com/cloud/utils/nio/NioConnection.java
+++ b/utils/src/main/java/com/cloud/utils/nio/NioConnection.java
@@ -98,10 +98,9 @@ public abstract class NioConnection implements Callable<Boolean> {
         }
         _isStartup = true;
 
-        _threadExecutor = Executors.newSingleThreadExecutor();
-        _futureTask = _threadExecutor.submit(this);
-
+        _threadExecutor = Executors.newSingleThreadExecutor(new NamedThreadFactory(this._name + "-NioConnectionHandler"));
         _isRunning = true;
+        _futureTask = _threadExecutor.submit(this);
     }
 
     public void stop() {