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/02/20 12:44:51 UTC
svn commit: r629429 - in
/mina/trunk/core/src/main/java/org/apache/mina/filter/executor:
OrderedThreadPoolExecutor.java UnorderedThreadPoolExecutor.java
Author: trustin
Date: Wed Feb 20 03:44:50 2008
New Revision: 629429
URL: http://svn.apache.org/viewvc?rev=629429&view=rev
Log:
Fixed issue: DIRMINA-533 (NPE in OrderedThreadPoolExecutor and UnorderedThreadPoolExecutor)
* Added null check to both executor
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=629429&r1=629428&r2=629429&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 Wed Feb 20 03:44:50 2008
@@ -489,7 +489,9 @@
}
try {
- runTasks(getSessionBuffer(session));
+ if (session != null) {
+ runTasks(getSessionBuffer(session));
+ }
} finally {
idleWorkers.incrementAndGet();
}
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=629429&r1=629428&r2=629429&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 Wed Feb 20 03:44:50 2008
@@ -430,9 +430,11 @@
break;
}
- queueHandler.polled(UnorderedThreadPoolExecutor.this, (IoEvent) task);
try {
- runTask(task);
+ if (task != null) {
+ queueHandler.polled(UnorderedThreadPoolExecutor.this, (IoEvent) task);
+ runTask(task);
+ }
} finally {
idleWorkers.incrementAndGet();
}