Author: trustin
Date: Thu Nov 8 22:39:04 2007
New Revision: 593430
URL: http://svn.apache.org/viewvc?rev=593430&view=rev
Log:
Made eventQueueHander final
Modified:
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/OrderedThreadPoolExecutor.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/executor/OrderedThreadPoolExecutor.java?rev=593430&r1=593429&r2=593430&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
Thu Nov 8 22:39:04 2007
@@ -52,7 +52,7 @@
public class OrderedThreadPoolExecutor extends ThreadPoolExecutor {
private static final IoSession EXIT_SIGNAL = new DummySession();
- private static final IoEventQueueHandler NOOP_QUEUE_MONITOR = new
IoEventQueueHandler() {
+ private static final IoEventQueueHandler NOOP_QUEUE_HANDLER = new
IoEventQueueHandler() {
public boolean accept(ThreadPoolExecutor executor, IoEvent event) {
return true;
}
@@ -73,7 +73,7 @@
private long completedTaskCount;
private volatile boolean shutdown;
- private volatile IoEventQueueHandler queueHandler;
+ private final IoEventQueueHandler queueHandler;
public OrderedThreadPoolExecutor() {
this(16);
@@ -95,8 +95,8 @@
public OrderedThreadPoolExecutor(
int corePoolSize, int maximumPoolSize,
long keepAliveTime, TimeUnit unit,
- IoEventQueueHandler queueMonitor) {
- this(corePoolSize, maximumPoolSize, keepAliveTime, unit,
Executors.defaultThreadFactory(), queueMonitor);
+ IoEventQueueHandler queueHandler) {
+ this(corePoolSize, maximumPoolSize, keepAliveTime, unit,
Executors.defaultThreadFactory(), queueHandler);
}
public OrderedThreadPoolExecutor(
@@ -109,7 +109,7 @@
public OrderedThreadPoolExecutor(
int corePoolSize, int maximumPoolSize,
long keepAliveTime, TimeUnit unit,
- ThreadFactory threadFactory, IoEventQueueHandler queueMonitor) {
+ ThreadFactory threadFactory, IoEventQueueHandler queueHandler) {
super(0, 1, keepAliveTime, unit, new SynchronousQueue<Runnable>(),
threadFactory, new AbortPolicy());
if (corePoolSize < 0) {
throw new IllegalArgumentException("corePoolSize: " +
corePoolSize);
@@ -119,20 +119,17 @@
throw new IllegalArgumentException("maximumPoolSize: " +
maximumPoolSize);
}
+ if (queueHandler == null) {
+ queueHandler = NOOP_QUEUE_HANDLER;
+ }
+
this.corePoolSize = corePoolSize;
this.maximumPoolSize = maximumPoolSize;
- setQueueHandler(queueMonitor);
+ this.queueHandler = queueHandler;
}
public IoEventQueueHandler getQueueHandler() {
return queueHandler;
- }
-
- public void setQueueHandler(IoEventQueueHandler queueHandler) {
- if (queueHandler == null) {
- queueHandler = NOOP_QUEUE_MONITOR;
- }
- this.queueHandler = queueHandler;
}
@Override
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=593430&r1=593429&r2=593430&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
Thu Nov 8 22:39:04 2007
@@ -56,7 +56,7 @@
private static final Runnable EXIT_SIGNAL = new Runnable() {
public void run() {}
};
- private static final IoEventQueueHandler NOOP_QUEUE_MONITOR = new
IoEventQueueHandler() {
+ private static final IoEventQueueHandler NOOP_QUEUE_HANDLER = new
IoEventQueueHandler() {
public boolean accept(ThreadPoolExecutor executor, IoEvent event) {
return true;
}
@@ -74,7 +74,7 @@
private long completedTaskCount;
private volatile boolean shutdown;
- private volatile IoEventQueueHandler queueHandler;
+ private final IoEventQueueHandler queueHandler;
public UnorderedThreadPoolExecutor() {
this(16);
@@ -96,8 +96,8 @@
public UnorderedThreadPoolExecutor(
int corePoolSize, int maximumPoolSize,
long keepAliveTime, TimeUnit unit,
- IoEventQueueHandler queueMonitor) {
- this(corePoolSize, maximumPoolSize, keepAliveTime, unit,
Executors.defaultThreadFactory(), queueMonitor);
+ IoEventQueueHandler queueHandler) {
+ this(corePoolSize, maximumPoolSize, keepAliveTime, unit,
Executors.defaultThreadFactory(), queueHandler);
}
public UnorderedThreadPoolExecutor(
@@ -110,7 +110,7 @@
public UnorderedThreadPoolExecutor(
int corePoolSize, int maximumPoolSize,
long keepAliveTime, TimeUnit unit,
- ThreadFactory threadFactory, IoEventQueueHandler queueMonitor) {
+ ThreadFactory threadFactory, IoEventQueueHandler queueHandler) {
super(0, 1, keepAliveTime, unit, new LinkedBlockingQueue<Runnable>(),
threadFactory, new AbortPolicy());
if (corePoolSize < 0) {
throw new IllegalArgumentException("corePoolSize: " +
corePoolSize);
@@ -120,20 +120,17 @@
throw new IllegalArgumentException("maximumPoolSize: " +
maximumPoolSize);
}
+ if (queueHandler == null) {
+ queueHandler = NOOP_QUEUE_HANDLER;
+ }
+
this.corePoolSize = corePoolSize;
this.maximumPoolSize = maximumPoolSize;
- setQueueHandler(queueMonitor);
+ this.queueHandler = queueHandler;
}
public IoEventQueueHandler getQueueHandler() {
return queueHandler;
- }
-
- public void setQueueHandler(IoEventQueueHandler queueHandler) {
- if (queueHandler == null) {
- queueHandler = NOOP_QUEUE_MONITOR;
- }
- this.queueHandler = queueHandler;
}
@Override
