Author: trustin
Date: Wed Aug  9 01:47:32 2006
New Revision: 429997

URL: http://svn.apache.org/viewvc?rev=429997&view=rev
Log:
Fixed a deadlock caused by ReferenceCountingIoFilter in PooledThreadModel

Added:
    directory/trunks/mina/core/src/main/java/org/apache/mina/filter/ReferenceCountingIoFilter.java   (contents, props changed)
      - copied, changed from r429983, directory/trunks/mina/core/src/main/java/org/apache/mina/common/ReferenceCountingIoFilter.java
Removed:
    directory/trunks/mina/core/src/main/java/org/apache/mina/common/ReferenceCountingIoFilter.java
Modified:
    directory/trunks/mina/core/src/main/java/org/apache/mina/common/IoFilter.java
    directory/trunks/mina/core/src/main/java/org/apache/mina/common/PooledThreadModel.java

Modified: directory/trunks/mina/core/src/main/java/org/apache/mina/common/IoFilter.java
URL: http://svn.apache.org/viewvc/directory/trunks/mina/core/src/main/java/org/apache/mina/common/IoFilter.java?rev=429997&r1=429996&r2=429997&view=diff
==============================================================================
--- directory/trunks/mina/core/src/main/java/org/apache/mina/common/IoFilter.java (original)
+++ directory/trunks/mina/core/src/main/java/org/apache/mina/common/IoFilter.java Wed Aug  9 01:47:32 2006
@@ -20,6 +20,8 @@
 
 import java.net.SocketAddress;
 
+import org.apache.mina.filter.ReferenceCountingIoFilter;
+
 /**
  * A filter which intercepts {@link IoHandler} events like Servlet
  * filters.  Filters can be used for these purposes:

Modified: directory/trunks/mina/core/src/main/java/org/apache/mina/common/PooledThreadModel.java
URL: http://svn.apache.org/viewvc/directory/trunks/mina/core/src/main/java/org/apache/mina/common/PooledThreadModel.java?rev=429997&r1=429996&r2=429997&view=diff
==============================================================================
--- directory/trunks/mina/core/src/main/java/org/apache/mina/common/PooledThreadModel.java (original)
+++ directory/trunks/mina/core/src/main/java/org/apache/mina/common/PooledThreadModel.java Wed Aug  9 01:47:32 2006
@@ -85,7 +85,6 @@
     }
     
     private final ThreadPoolFilter filter = new ThreadPoolFilter();
-    private final IoFilter proxy = new ReferenceCountingIoFilter( filter );
 
     private PooledThreadModel( String threadNamePrefix )
     {
@@ -130,6 +129,6 @@
 
     public void buildFilterChain( IoFilterChain chain ) throws Exception
     {
-        chain.addFirst( PooledThreadModel.class.getName(), proxy );
+        chain.addFirst( PooledThreadModel.class.getName(), filter );
     }
 }

Copied: directory/trunks/mina/core/src/main/java/org/apache/mina/filter/ReferenceCountingIoFilter.java (from r429983, directory/trunks/mina/core/src/main/java/org/apache/mina/common/ReferenceCountingIoFilter.java)
URL: http://svn.apache.org/viewvc/directory/trunks/mina/core/src/main/java/org/apache/mina/filter/ReferenceCountingIoFilter.java?p2=directory/trunks/mina/core/src/main/java/org/apache/mina/filter/ReferenceCountingIoFilter.java&p1=directory/trunks/mina/core/src/main/java/org/apache/mina/common/ReferenceCountingIoFilter.java&r1=429983&r2=429997&rev=429997&view=diff
==============================================================================
--- directory/trunks/mina/core/src/main/java/org/apache/mina/common/ReferenceCountingIoFilter.java (original)
+++ directory/trunks/mina/core/src/main/java/org/apache/mina/filter/ReferenceCountingIoFilter.java Wed Aug  9 01:47:32 2006
@@ -16,7 +16,12 @@
  *   limitations under the License.
  *
  */
-package org.apache.mina.common;
+package org.apache.mina.filter;
+
+import org.apache.mina.common.IdleStatus;
+import org.apache.mina.common.IoFilter;
+import org.apache.mina.common.IoFilterChain;
+import org.apache.mina.common.IoSession;
 
 
 /**

Propchange: directory/trunks/mina/core/src/main/java/org/apache/mina/filter/ReferenceCountingIoFilter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/mina/core/src/main/java/org/apache/mina/filter/ReferenceCountingIoFilter.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision