You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by tr...@apache.org on 2008/04/14 08:47:43 UTC

svn commit: r647673 - in /mina/trunk/core/src/main/java/org/apache/mina/filter/executor: IoEventQueueHandler.java OrderedThreadPoolExecutor.java UnorderedThreadPoolExecutor.java

Author: trustin
Date: Sun Apr 13 23:47:40 2008
New Revision: 647673

URL: http://svn.apache.org/viewvc?rev=647673&view=rev
Log:
Moved the duplicated code in (Un)OrderedThreadPoolExecutor to IoEventQueueHandler

Modified:
    mina/trunk/core/src/main/java/org/apache/mina/filter/executor/IoEventQueueHandler.java
    mina/trunk/core/src/main/java/org/apache/mina/filter/executor/OrderedThreadPoolExecutor.java
    mina/trunk/core/src/main/java/org/apache/mina/filter/executor/UnorderedThreadPoolExecutor.java

Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/executor/IoEventQueueHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/executor/IoEventQueueHandler.java?rev=647673&r1=647672&r2=647673&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/executor/IoEventQueueHandler.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/executor/IoEventQueueHandler.java Sun Apr 13 23:47:40 2008
@@ -32,6 +32,22 @@
  * @version $Rev$, $Date$
  */
 public interface IoEventQueueHandler extends EventListener {
+
+    /**
+     * A dummy handler which always accepts event doing nothing particular.
+     */
+    static IoEventQueueHandler NOOP = new IoEventQueueHandler() {
+        public boolean accept(ThreadPoolExecutor executor, IoEvent event) {
+            return true;
+        }
+        public void offered(ThreadPoolExecutor executor, IoEvent event) {
+            // NOOP
+        }
+        public void polled(ThreadPoolExecutor executor, IoEvent event) {
+            // NOOP
+        }
+    };
+
     /**
      * Returns <tt>true</tt> if and only if the specified <tt>event</tt> is
      * allowed to be offered to the event queue.  The <tt>event</tt> is dropped

Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/executor/OrderedThreadPoolExecutor.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/executor/OrderedThreadPoolExecutor.java?rev=647673&r1=647672&r2=647673&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/executor/OrderedThreadPoolExecutor.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/executor/OrderedThreadPoolExecutor.java Sun Apr 13 23:47:40 2008
@@ -52,17 +52,6 @@
 public class OrderedThreadPoolExecutor extends ThreadPoolExecutor {
 
     private static final IoSession EXIT_SIGNAL = new DummySession();
-    private static final IoEventQueueHandler NOOP_QUEUE_HANDLER = new IoEventQueueHandler() {
-        public boolean accept(ThreadPoolExecutor executor, IoEvent event) {
-            return true;
-        }
-        public void offered(ThreadPoolExecutor executor, IoEvent event) {
-            // NOOP
-        }
-        public void polled(ThreadPoolExecutor executor, IoEvent event) {
-            // NOOP
-        }
-    };
 
     private final AttributeKey BUFFER = new AttributeKey(getClass(), "buffer");
     private final BlockingQueue<IoSession> waitingSessions = new LinkedBlockingQueue<IoSession>();
@@ -124,7 +113,7 @@
         }
 
         if (queueHandler == null) {
-            queueHandler = NOOP_QUEUE_HANDLER;
+            queueHandler = IoEventQueueHandler.NOOP;
         }
 
         this.corePoolSize = corePoolSize;

Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/executor/UnorderedThreadPoolExecutor.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/executor/UnorderedThreadPoolExecutor.java?rev=647673&r1=647672&r2=647673&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/executor/UnorderedThreadPoolExecutor.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/executor/UnorderedThreadPoolExecutor.java Sun Apr 13 23:47:40 2008
@@ -61,18 +61,6 @@
         }
     };
 
-    private static final IoEventQueueHandler NOOP_QUEUE_HANDLER = new IoEventQueueHandler() {
-        public boolean accept(ThreadPoolExecutor executor, IoEvent event) {
-            return true;
-        }
-        public void offered(ThreadPoolExecutor executor, IoEvent event) {
-            // NOOP
-        }
-        public void polled(ThreadPoolExecutor executor, IoEvent event) {
-            // NOOP
-        }
-    };
-
     private final Set<Worker> workers = new HashSet<Worker>();
 
     private volatile int corePoolSize;
@@ -130,7 +118,7 @@
         }
 
         if (queueHandler == null) {
-            queueHandler = NOOP_QUEUE_HANDLER;
+            queueHandler = IoEventQueueHandler.NOOP;
         }
 
         this.corePoolSize = corePoolSize;