From 3cbe3f1f921ba6468de98eb008b3ec203be4e60b Mon Sep 17 00:00:00 2001
From: Bosanac Dejan <dejanb@apache.org>
Date: Tue, 9 Mar 2010 12:18:47 +0000
Subject: [PATCH] https://issues.apache.org/activemq/browse/AMQ-2440 - fixing
 bug on marking worker as non empty

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@920827 13f79535-47bb-0310-9956-ffa450edef68
---
 .../transport/nio/SelectorManager.java        |  2 +-
 .../transport/nio/SelectorWorker.java         | 23 ++++++++-----------
 .../transport/stomp/StompNIOTransport.java    |  1 +
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/nio/SelectorManager.java b/activemq-core/src/main/java/org/apache/activemq/transport/nio/SelectorManager.java
index 2654ad71a2..24f9c3f27b 100644
--- a/activemq-core/src/main/java/org/apache/activemq/transport/nio/SelectorManager.java
+++ b/activemq-core/src/main/java/org/apache/activemq/transport/nio/SelectorManager.java
@@ -99,7 +99,7 @@ public final class SelectorManager {
     }
 
     public synchronized void onWorkerNotFullEvent(SelectorWorker worker) {
-        freeWorkers.add(worker);
+        freeWorkers.addFirst(worker);
     }
 
     public Executor getChannelExecutor() {
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/nio/SelectorWorker.java b/activemq-core/src/main/java/org/apache/activemq/transport/nio/SelectorWorker.java
index 8423db0a5d..e55e378155 100644
--- a/activemq-core/src/main/java/org/apache/activemq/transport/nio/SelectorWorker.java
+++ b/activemq-core/src/main/java/org/apache/activemq/transport/nio/SelectorWorker.java
@@ -53,7 +53,7 @@ public class SelectorWorker implements Runnable {
         int use = retainCounter.decrementAndGet();
         if (use == 0) {
             manager.onWorkerEmptyEvent(this);
-        } else if (use < maxChannelsPerWorker) {
+        } else if (use == maxChannelsPerWorker - 1) {
             manager.onWorkerNotFullEvent(this);
         }
     }
@@ -68,18 +68,15 @@ public class SelectorWorker implements Runnable {
         selector.wakeup();
     }
     
-    private boolean processIoTasks() {
-        boolean rc = false;
+    private void processIoTasks() {
         Runnable task; 
         while( (task= ioTasks.poll()) !=null ) {
             try {
-                rc = true;
                 task.run();
             } catch (Throwable e) {
                 e.printStackTrace();
             }
         }
-        return rc;
     }
 
     
@@ -90,11 +87,11 @@ public class SelectorWorker implements Runnable {
         try {
             Thread.currentThread().setName("Selector Worker: " + id);
             while (!isReleased()) {
-                
-                if( processIoTasks() ) {
-                    continue;
-                }
-                int count = selector.select(10);
+            	
+            	processIoTasks();
+            	
+            	int count = selector.select(10);
+            	
                 if (count == 0) {
                     continue;
                 }
@@ -134,8 +131,8 @@ public class SelectorWorker implements Runnable {
                 }
 
             }
-            
-        } catch (Throwable e) {
+        } catch (Throwable e) {         	
+            e.printStackTrace();
             // Notify all the selections that the error occurred.
             Set keys = selector.keys();
             for (Iterator i = keys.iterator(); i.hasNext();) {
@@ -143,12 +140,12 @@ public class SelectorWorker implements Runnable {
                 SelectorSelection s = (SelectorSelection)key.attachment();
                 s.onError(e);
             }
-
         } finally {
             try {
                 manager.onWorkerEmptyEvent(this);
                 selector.close();
             } catch (IOException ignore) {
+            	ignore.printStackTrace();
             }
             Thread.currentThread().setName(origName);
         }
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompNIOTransport.java b/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompNIOTransport.java
index f803a45f38..94c0640a59 100644
--- a/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompNIOTransport.java
+++ b/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompNIOTransport.java
@@ -145,6 +145,7 @@ public class StompNIOTransport extends TcpTransport {
         try {
             selection.close();
         } catch (Exception e) {
+        	e.printStackTrace();
         }
         super.doStop(stopper);
     }