diff --git a/utils/pom.xml b/utils/pom.xml
index 0b84f38938a..1f363aca62c 100755
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -178,6 +178,7 @@
           <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/com/cloud/utils/nio/Link.java b/utils/src/com/cloud/utils/nio/Link.java
index 729af6c0d02..4331ef283cd 100755
--- a/utils/src/com/cloud/utils/nio/Link.java
+++ b/utils/src/com/cloud/utils/nio/Link.java
@@ -617,7 +617,7 @@ public class Link {
                 case NEED_TASK:
                     Runnable task;
                     while ((task = sslEngine.getDelegatedTask()) != null) {
-                        new Thread(task).run();
+                        task.run();
                     }
                     break;
                 case FINISHED:
diff --git a/utils/src/com/cloud/utils/nio/NioConnection.java b/utils/src/com/cloud/utils/nio/NioConnection.java
index fa92959e3e0..5040ab1d567 100755
--- a/utils/src/com/cloud/utils/nio/NioConnection.java
+++ b/utils/src/com/cloud/utils/nio/NioConnection.java
@@ -170,8 +170,6 @@ public abstract class NioConnection implements Runnable {
                 processTodos();
             } catch (Throwable e) {
                 s_logger.warn("Caught an exception but continuing on.", e);
-            } finally {
-                _selector.wakeup();
             }
         }
         synchronized (_thread) {