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 2006/03/12 06:06:12 UTC
svn commit: r385247 - in /directory/trunks/mina:
core/src/main/java/org/apache/mina/common/
core/src/main/java/org/apache/mina/common/support/
core/src/main/java/org/apache/mina/filter/
core/src/main/java/org/apache/mina/transport/socket/nio/support/ c...
Author: trustin
Date: Sat Mar 11 21:06:11 2006
New Revision: 385247
URL: http://svn.apache.org/viewcvs?rev=385247&view=rev
Log:
Removed unused parameter in IoFilter.filterClose()
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/IoFilterAdapter.java
directory/trunks/mina/core/src/main/java/org/apache/mina/common/support/AbstractIoFilterChain.java
directory/trunks/mina/core/src/main/java/org/apache/mina/common/support/BaseIoSession.java
directory/trunks/mina/core/src/main/java/org/apache/mina/filter/LoggingFilter.java
directory/trunks/mina/core/src/main/java/org/apache/mina/filter/ThreadPoolFilter.java
directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramFilterChain.java
directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramSessionImpl.java
directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/SocketFilterChain.java
directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/SocketSessionImpl.java
directory/trunks/mina/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeFilterChain.java
directory/trunks/mina/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeSessionImpl.java
directory/trunks/mina/core/src/test/java/org/apache/mina/common/IoFilterChainTest.java
directory/trunks/mina/core/src/test/java/org/apache/mina/filter/ThreadPoolFilterRegressionTest.java
directory/trunks/mina/filter-ssl/src/main/java/org/apache/mina/filter/SSLFilter.java
Modified: directory/trunks/mina/core/src/main/java/org/apache/mina/common/IoFilter.java
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/core/src/main/java/org/apache/mina/common/IoFilter.java?rev=385247&r1=385246&r2=385247&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 Sat Mar 11 21:06:11 2006
@@ -18,8 +18,6 @@
*/
package org.apache.mina.common;
-
-
/**
* A filter which intercepts {@link IoHandler} events like Servlet
* filters. Filters can be used for these purposes:
@@ -182,7 +180,7 @@
/**
* Filters {@link IoSession#close()} method invocation.
*/
- void filterClose( NextFilter nextFilter, IoSession session, CloseFuture closeFuture ) throws Exception;
+ void filterClose( NextFilter nextFilter, IoSession session ) throws Exception;
/**
* Filters {@link IoSession#write(Object)} method invocation.
@@ -237,7 +235,7 @@
/**
* Forwards <tt>filterClose</tt> event to next filter.
*/
- void filterClose( IoSession session, CloseFuture closeFuture );
+ void filterClose( IoSession session );
}
/**
Modified: directory/trunks/mina/core/src/main/java/org/apache/mina/common/IoFilterAdapter.java
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/core/src/main/java/org/apache/mina/common/IoFilterAdapter.java?rev=385247&r1=385246&r2=385247&view=diff
==============================================================================
--- directory/trunks/mina/core/src/main/java/org/apache/mina/common/IoFilterAdapter.java (original)
+++ directory/trunks/mina/core/src/main/java/org/apache/mina/common/IoFilterAdapter.java Sat Mar 11 21:06:11 2006
@@ -92,8 +92,8 @@
nextFilter.filterWrite( session, writeRequest );
}
- public void filterClose( NextFilter nextFilter, IoSession session, CloseFuture closeFuture ) throws Exception
+ public void filterClose( NextFilter nextFilter, IoSession session ) throws Exception
{
- nextFilter.filterClose( session, closeFuture );
+ nextFilter.filterClose( session );
}
}
Modified: directory/trunks/mina/core/src/main/java/org/apache/mina/common/support/AbstractIoFilterChain.java
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/core/src/main/java/org/apache/mina/common/support/AbstractIoFilterChain.java?rev=385247&r1=385246&r2=385247&view=diff
==============================================================================
--- directory/trunks/mina/core/src/main/java/org/apache/mina/common/support/AbstractIoFilterChain.java (original)
+++ directory/trunks/mina/core/src/main/java/org/apache/mina/common/support/AbstractIoFilterChain.java Sat Mar 11 21:06:11 2006
@@ -24,7 +24,6 @@
import java.util.List;
import java.util.Map;
-import org.apache.mina.common.CloseFuture;
import org.apache.mina.common.IdleStatus;
import org.apache.mina.common.IoFilter;
import org.apache.mina.common.IoFilterAdapter;
@@ -133,9 +132,9 @@
}
}
- public void filterClose( NextFilter nextFilter, IoSession session, CloseFuture closeFuture ) throws Exception
+ public void filterClose( NextFilter nextFilter, IoSession session ) throws Exception
{
- doClose( session, closeFuture );
+ doClose( session );
}
};
}
@@ -213,9 +212,9 @@
nextFilter.filterWrite( session, writeRequest );
}
- public void filterClose( NextFilter nextFilter, IoSession session, CloseFuture closeFuture ) throws Exception
+ public void filterClose( NextFilter nextFilter, IoSession session ) throws Exception
{
- nextFilter.filterClose( session, closeFuture );
+ nextFilter.filterClose( session );
}
};
}
@@ -561,19 +560,18 @@
}
}
- public void filterClose( IoSession session, CloseFuture closeFuture )
+ public void filterClose( IoSession session )
{
Entry tail = this.tail;
- callPreviousFilterClose( tail, session, closeFuture );
+ callPreviousFilterClose( tail, session );
}
private void callPreviousFilterClose( Entry entry,
- IoSession session,
- CloseFuture closeFuture )
+ IoSession session )
{
try
{
- entry.getFilter().filterClose( entry.getNextFilter(), session, closeFuture );
+ entry.getFilter().filterClose( entry.getNextFilter(), session );
}
catch( Throwable e )
{
@@ -692,7 +690,7 @@
protected abstract void doWrite( IoSession session, WriteRequest writeRequest ) throws Exception;
- protected abstract void doClose( IoSession session, CloseFuture closeFuture ) throws Exception;
+ protected abstract void doClose( IoSession session ) throws Exception;
private class EntryImpl implements Entry
{
@@ -773,10 +771,10 @@
callPreviousFilterWrite( nextEntry, session, writeRequest );
}
- public void filterClose( IoSession session, CloseFuture closeFuture )
+ public void filterClose( IoSession session )
{
Entry nextEntry = EntryImpl.this.prevEntry;
- callPreviousFilterClose( nextEntry, session, closeFuture );
+ callPreviousFilterClose( nextEntry, session );
}
};
}
Modified: directory/trunks/mina/core/src/main/java/org/apache/mina/common/support/BaseIoSession.java
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/core/src/main/java/org/apache/mina/common/support/BaseIoSession.java?rev=385247&r1=385246&r2=385247&view=diff
==============================================================================
--- directory/trunks/mina/core/src/main/java/org/apache/mina/common/support/BaseIoSession.java (original)
+++ directory/trunks/mina/core/src/main/java/org/apache/mina/common/support/BaseIoSession.java Sat Mar 11 21:06:11 2006
@@ -108,7 +108,7 @@
}
}
- close0( closeFuture );
+ close0();
return closeFuture;
}
@@ -116,10 +116,8 @@
* Implement this method to perform real close operation.
* By default, this method is implemented to set the future to
* 'closed' immediately.
- *
- * @param closeFuture a future that should be set to 'closed'
*/
- protected void close0( CloseFuture closeFuture )
+ protected void close0()
{
closeFuture.setClosed();
}
Modified: directory/trunks/mina/core/src/main/java/org/apache/mina/filter/LoggingFilter.java
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/core/src/main/java/org/apache/mina/filter/LoggingFilter.java?rev=385247&r1=385246&r2=385247&view=diff
==============================================================================
--- directory/trunks/mina/core/src/main/java/org/apache/mina/filter/LoggingFilter.java (original)
+++ directory/trunks/mina/core/src/main/java/org/apache/mina/filter/LoggingFilter.java Sat Mar 11 21:06:11 2006
@@ -18,7 +18,6 @@
*/
package org.apache.mina.filter;
-import org.apache.mina.common.CloseFuture;
import org.apache.mina.common.IdleStatus;
import org.apache.mina.common.IoFilterAdapter;
import org.apache.mina.common.IoSession;
@@ -99,9 +98,9 @@
nextFilter.filterWrite( session, writeRequest );
}
- public void filterClose( NextFilter nextFilter, IoSession session, CloseFuture closeFuture ) throws Exception
+ public void filterClose( NextFilter nextFilter, IoSession session ) throws Exception
{
SessionLog.info( session, "CLOSE" );
- nextFilter.filterClose( session, closeFuture );
+ nextFilter.filterClose( session );
}
}
Modified: directory/trunks/mina/core/src/main/java/org/apache/mina/filter/ThreadPoolFilter.java
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/core/src/main/java/org/apache/mina/filter/ThreadPoolFilter.java?rev=385247&r1=385246&r2=385247&view=diff
==============================================================================
--- directory/trunks/mina/core/src/main/java/org/apache/mina/filter/ThreadPoolFilter.java (original)
+++ directory/trunks/mina/core/src/main/java/org/apache/mina/filter/ThreadPoolFilter.java Sat Mar 11 21:06:11 2006
@@ -25,7 +25,6 @@
import java.util.Map;
import java.util.Set;
-import org.apache.mina.common.CloseFuture;
import org.apache.mina.common.IdleStatus;
import org.apache.mina.common.IoFilterAdapter;
import org.apache.mina.common.IoFilterChain;
@@ -717,8 +716,8 @@
nextFilter.filterWrite( session, writeRequest );
}
- public void filterClose( NextFilter nextFilter, IoSession session, CloseFuture closeFuture ) throws Exception
+ public void filterClose( NextFilter nextFilter, IoSession session ) throws Exception
{
- nextFilter.filterClose( session, closeFuture );
+ nextFilter.filterClose( session );
}
}
Modified: directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramFilterChain.java
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramFilterChain.java?rev=385247&r1=385246&r2=385247&view=diff
==============================================================================
--- directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramFilterChain.java (original)
+++ directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramFilterChain.java Sat Mar 11 21:06:11 2006
@@ -18,7 +18,6 @@
*/
package org.apache.mina.transport.socket.nio.support;
-import org.apache.mina.common.CloseFuture;
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.IoFilter.WriteRequest;
@@ -53,7 +52,7 @@
}
}
- protected void doClose( IoSession session, CloseFuture closeFuture )
+ protected void doClose( IoSession session )
{
DatagramSessionImpl s = ( DatagramSessionImpl ) session;
DatagramService manager = s.getManagerDelegate();
@@ -63,7 +62,7 @@
}
else
{
- closeFuture.setClosed();
+ session.getCloseFuture().setClosed();
}
}
}
Modified: directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramSessionImpl.java
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramSessionImpl.java?rev=385247&r1=385246&r2=385247&view=diff
==============================================================================
--- directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramSessionImpl.java (original)
+++ directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramSessionImpl.java Sat Mar 11 21:06:11 2006
@@ -23,7 +23,6 @@
import java.nio.channels.DatagramChannel;
import java.nio.channels.SelectionKey;
-import org.apache.mina.common.CloseFuture;
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoService;
@@ -134,9 +133,9 @@
return handler;
}
- protected void close0( CloseFuture closeFuture )
+ protected void close0()
{
- filterChain.filterClose( this, closeFuture );
+ filterChain.filterClose( this );
}
Queue getWriteRequestQueue()
Modified: directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/SocketFilterChain.java
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/SocketFilterChain.java?rev=385247&r1=385246&r2=385247&view=diff
==============================================================================
--- directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/SocketFilterChain.java (original)
+++ directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/SocketFilterChain.java Sat Mar 11 21:06:11 2006
@@ -3,7 +3,6 @@
import java.io.IOException;
import org.apache.mina.common.ByteBuffer;
-import org.apache.mina.common.CloseFuture;
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.IoFilter.WriteRequest;
@@ -39,7 +38,7 @@
}
}
- protected void doClose( IoSession session, CloseFuture closeFuture ) throws IOException
+ protected void doClose( IoSession session ) throws IOException
{
SocketSessionImpl s = ( SocketSessionImpl ) session;
s.getIoProcessor().remove( s );
Modified: directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/SocketSessionImpl.java
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/SocketSessionImpl.java?rev=385247&r1=385246&r2=385247&view=diff
==============================================================================
--- directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/SocketSessionImpl.java (original)
+++ directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/SocketSessionImpl.java Sat Mar 11 21:06:11 2006
@@ -24,7 +24,6 @@
import java.nio.channels.SocketChannel;
import java.util.Set;
-import org.apache.mina.common.CloseFuture;
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoService;
@@ -145,9 +144,9 @@
return handler;
}
- protected void close0( CloseFuture closeFuture )
+ protected void close0()
{
- filterChain.filterClose( this, closeFuture );
+ filterChain.filterClose( this );
}
Queue getWriteRequestQueue()
Modified: directory/trunks/mina/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeFilterChain.java
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeFilterChain.java?rev=385247&r1=385246&r2=385247&view=diff
==============================================================================
--- directory/trunks/mina/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeFilterChain.java (original)
+++ directory/trunks/mina/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeFilterChain.java Sat Mar 11 21:06:11 2006
@@ -1,7 +1,6 @@
package org.apache.mina.transport.vmpipe.support;
import org.apache.mina.common.ByteBuffer;
-import org.apache.mina.common.CloseFuture;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.IoFilter.WriteRequest;
import org.apache.mina.common.support.AbstractIoFilterChain;
@@ -89,16 +88,16 @@
}
}
- protected void doClose( IoSession session, CloseFuture closeFuture )
+ protected void doClose( IoSession session )
{
VmPipeSessionImpl s = ( VmPipeSessionImpl ) session;
synchronized( s.lock )
{
- if( !closeFuture.isClosed() )
+ if( !session.getCloseFuture().isClosed() )
{
s.getManagedSessions().remove( s );
( ( VmPipeFilterChain ) s.getFilterChain() ).sessionClosed( session );
- closeFuture.setClosed();
+ session.getCloseFuture().setClosed();
s.remoteSession.close();
}
}
Modified: directory/trunks/mina/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeSessionImpl.java
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeSessionImpl.java?rev=385247&r1=385246&r2=385247&view=diff
==============================================================================
--- directory/trunks/mina/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeSessionImpl.java (original)
+++ directory/trunks/mina/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeSessionImpl.java Sat Mar 11 21:06:11 2006
@@ -7,7 +7,6 @@
import java.net.SocketAddress;
import java.util.Set;
-import org.apache.mina.common.CloseFuture;
import org.apache.mina.common.ExceptionMonitor;
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoFilterChainBuilder;
@@ -19,8 +18,6 @@
import org.apache.mina.common.IoFilter.WriteRequest;
import org.apache.mina.common.support.BaseIoSession;
import org.apache.mina.common.support.BaseIoSessionConfig;
-import org.apache.mina.filter.codec.ProtocolDecoder;
-import org.apache.mina.filter.codec.ProtocolEncoder;
import org.apache.mina.util.Queue;
/**
@@ -141,19 +138,9 @@
return handler;
}
- public ProtocolEncoder getEncoder()
+ protected void close0()
{
- return null;
- }
-
- public ProtocolDecoder getDecoder()
- {
- return null;
- }
-
- protected void close0( CloseFuture closeFuture )
- {
- filterChain.filterClose( this, closeFuture );
+ filterChain.filterClose( this );
}
protected void write0( WriteRequest writeRequest )
Modified: directory/trunks/mina/core/src/test/java/org/apache/mina/common/IoFilterChainTest.java
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/core/src/test/java/org/apache/mina/common/IoFilterChainTest.java?rev=385247&r1=385246&r2=385247&view=diff
==============================================================================
--- directory/trunks/mina/core/src/test/java/org/apache/mina/common/IoFilterChainTest.java (original)
+++ directory/trunks/mina/core/src/test/java/org/apache/mina/common/IoFilterChainTest.java Sat Mar 11 21:06:11 2006
@@ -275,7 +275,7 @@
{
}
- protected void doClose( IoSession session, CloseFuture closeFuture )
+ protected void doClose( IoSession session )
{
}
};
@@ -361,9 +361,9 @@
nextFilter.messageSent( session, message );
}
- public void filterClose( NextFilter nextFilter, IoSession session, CloseFuture closeFuture ) throws Exception
+ public void filterClose( NextFilter nextFilter, IoSession session ) throws Exception
{
- nextFilter.filterClose( session, closeFuture );
+ nextFilter.filterClose( session );
}
}
@@ -441,7 +441,7 @@
messageSent( session, writeRequest.getMessage() );
}
- protected void doClose( IoSession session, CloseFuture closeFuture )
+ protected void doClose( IoSession session )
{
}
}
Modified: directory/trunks/mina/core/src/test/java/org/apache/mina/filter/ThreadPoolFilterRegressionTest.java
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/core/src/test/java/org/apache/mina/filter/ThreadPoolFilterRegressionTest.java?rev=385247&r1=385246&r2=385247&view=diff
==============================================================================
--- directory/trunks/mina/core/src/test/java/org/apache/mina/filter/ThreadPoolFilterRegressionTest.java (original)
+++ directory/trunks/mina/core/src/test/java/org/apache/mina/filter/ThreadPoolFilterRegressionTest.java Sat Mar 11 21:06:11 2006
@@ -9,8 +9,8 @@
import org.apache.mina.common.IdleStatus;
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoHandler;
-import org.apache.mina.common.IoSession;
import org.apache.mina.common.IoService;
+import org.apache.mina.common.IoSession;
import org.apache.mina.common.IoSessionConfig;
import org.apache.mina.common.TransportType;
import org.apache.mina.common.WriteFuture;
@@ -26,7 +26,7 @@
protected void doWrite( IoSession session, WriteRequest writeRequest )
{
}
- protected void doClose( IoSession session, CloseFuture closeFuture )
+ protected void doClose( IoSession session )
{
}
};
@@ -245,7 +245,7 @@
{
}
- public void filterClose( IoSession session, CloseFuture closeFuture )
+ public void filterClose( IoSession session )
{
}
@@ -350,7 +350,7 @@
{
}
- public void filterClose( IoSession session, CloseFuture closeFuture )
+ public void filterClose( IoSession session )
{
}
}
Modified: directory/trunks/mina/filter-ssl/src/main/java/org/apache/mina/filter/SSLFilter.java
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/filter-ssl/src/main/java/org/apache/mina/filter/SSLFilter.java?rev=385247&r1=385246&r2=385247&view=diff
==============================================================================
--- directory/trunks/mina/filter-ssl/src/main/java/org/apache/mina/filter/SSLFilter.java (original)
+++ directory/trunks/mina/filter-ssl/src/main/java/org/apache/mina/filter/SSLFilter.java Sat Mar 11 21:06:11 2006
@@ -26,7 +26,6 @@
import org.apache.mina.common.ByteBuffer;
import org.apache.mina.common.ByteBufferProxy;
-import org.apache.mina.common.CloseFuture;
import org.apache.mina.common.IoFilterAdapter;
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoFuture;
@@ -526,7 +525,7 @@
}
}
- public void filterClose( final NextFilter nextFilter, final IoSession session, final CloseFuture closeFuture ) throws SSLException
+ public void filterClose( final NextFilter nextFilter, final IoSession session ) throws SSLException
{
SSLHandler handler = getSSLSessionHandler( session );
@@ -544,7 +543,7 @@
{
if( future == null )
{
- nextFilter.filterClose( session, closeFuture );
+ nextFilter.filterClose( session );
}
else
{
@@ -552,7 +551,7 @@
{
public void operationComplete( IoFuture future )
{
- nextFilter.filterClose( session, closeFuture );
+ nextFilter.filterClose( session );
}
});
}