DIRMINA-1113 - Random failure on PriorityThreadPoolExecutorTest.testPrioritisation

mina-core/src/main/java/org/apache/mina/core/filterchain/IoFilterAdapter.java

@@ -169,4 +169,95 @@ public void event(NextFilter nextFilter, IoSession session, FilterEvent event) t
     public String toString() {
         return this.getClass().getSimpleName();
     }
+
+    public static class NextFilterAdapter implements NextFilter {
+
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        public void sessionCreated(IoSession session) {
+
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        public void sessionOpened(IoSession session) {
+
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        public void sessionClosed(IoSession session) {
+
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        public void sessionIdle(IoSession session, IdleStatus status) {
+
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        public void exceptionCaught(IoSession session, Throwable cause) {
+
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        public void inputClosed(IoSession session) {
+
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        public void messageReceived(IoSession session, Object message) {
+
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        public void messageSent(IoSession session, WriteRequest writeRequest) {
+
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        public void filterWrite(IoSession session, WriteRequest writeRequest) {
+
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        public void filterClose(IoSession session) {
+
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        public void event(IoSession session, FilterEvent event) {
+
+        }
+    }
 }

mina-core/src/main/java/org/apache/mina/filter/executor/PriorityThreadPoolExecutor.java

@@ -751,7 +751,8 @@ public void run() {
 
             try {
                 for (;;) {
-                    IoSession session = fetchSession();
+                    SessionEntry entry = fetchSessionEntry();
+                    IoSession session = entry == null ? null : entry.getSession();
 
                     idleWorkers.decrementAndGet();
 
@@ -763,7 +764,7 @@ public void run() {
                         }
                     }
 
-                    if (session == EXIT_SIGNAL) {
+                    if (entry == EXIT_SIGNAL) {
                         break;
                     }
 
@@ -782,7 +783,7 @@ public void run() {
             }
         }
 
-        private IoSession fetchSession() {
+        private SessionEntry fetchSessionEntry() {
             SessionEntry entry = null;
             long currentTime = System.currentTimeMillis();
             long deadline = currentTime + getKeepAliveTime(TimeUnit.MILLISECONDS);
@@ -809,10 +810,7 @@ private IoSession fetchSession() {
                 }
             }
 
-            if (entry != null) {
-                return entry.getSession();
-            }
-            return null;
+            return entry;
         }
 
         private void runTasks(SessionQueue sessionTasksQueue) {

mina-core/src/test/java/org/apache/mina/filter/executor/ExecutorFilterRegressionTest.java

@@ -25,6 +25,7 @@
 import java.util.concurrent.TimeUnit;
 
 import org.apache.mina.core.filterchain.IoFilter.NextFilter;
+import org.apache.mina.core.filterchain.IoFilterAdapter;
 import org.apache.mina.core.session.DummySession;
 import org.apache.mina.core.session.IdleStatus;
 import org.apache.mina.core.session.IoSession;
@@ -109,36 +110,9 @@ public synchronized void setLastCount(Integer newCount) {
         }
     }
 
-    private static class EventOrderChecker implements NextFilter {
+    private static class EventOrderChecker extends IoFilterAdapter.NextFilterAdapter {
         Throwable throwable;
 
-        /**
-         * Default constructor
-         */
-        public EventOrderChecker() {
-            super();
-        }
-
-        public void sessionOpened(IoSession session) {
-            // Do nothing
-        }
-
-        public void sessionClosed(IoSession session) {
-            // Do nothing
-        }
-
-        public void sessionIdle(IoSession session, IdleStatus status) {
-            // Do nothing
-        }
-
-        public void exceptionCaught(IoSession session, Throwable cause) {
-            // Do nothing
-        }
-
-        public void inputClosed(IoSession session) {
-            // Do nothing
-        }
-
         public void messageReceived(IoSession session, Object message) {
             try {
                 ((EventOrderCounter) session).setLastCount((Integer) message);
@@ -148,25 +122,5 @@ public void messageReceived(IoSession session, Object message) {
                 }
             }
         }
-
-        public void messageSent(IoSession session, WriteRequest writeRequest) {
-            // Do nothing
-        }
-
-        public void filterWrite(IoSession session, WriteRequest writeRequest) {
-            // Do nothing
-        }
-
-        public void filterClose(IoSession session) {
-            // Do nothing
-        }
-
-        public void sessionCreated(IoSession session) {
-            // Do nothing
-        }
-
-        public void event(IoSession session, FilterEvent event) {
-            // Do nothing
-        }
     }
 }