You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by tr...@apache.org on 2005/10/31 11:25:52 UTC
svn commit: r329792 -
/directory/network/trunk/src/java/org/apache/mina/filter/ThreadPoolFilter.java
Author: trustin
Date: Mon Oct 31 02:25:48 2005
New Revision: 329792
URL: http://svn.apache.org/viewcvs?rev=329792&view=rev
Log:
Fixed: another lockup in ThreadPoolFilter.
Modified:
directory/network/trunk/src/java/org/apache/mina/filter/ThreadPoolFilter.java
Modified: directory/network/trunk/src/java/org/apache/mina/filter/ThreadPoolFilter.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/filter/ThreadPoolFilter.java?rev=329792&r1=329791&r2=329792&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/filter/ThreadPoolFilter.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/filter/ThreadPoolFilter.java Mon Oct 31 02:25:48 2005
@@ -332,11 +332,6 @@
{
for( ;; )
{
- if( shuttingDown )
- {
- return null;
- }
-
try
{
unfetchedSessionBuffers.waitForNewItem();
@@ -691,7 +686,10 @@
leader.interrupt();
try
{
- leader.join();
+ // This timeout (100) will help us from
+ // infinite lock-up and interrupt workers again.
+ // (Or we could acquire a monitor for unfetchedSessionBuffers.)
+ leader.join( 100 );
}
catch( InterruptedException e )
{