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/07/01 07:31:53 UTC
svn commit: r208717 - in /directory/network:
branches/0.7/src/java/org/apache/mina/io/
branches/0.7/src/java/org/apache/mina/protocol/
trunk/src/java/org/apache/mina/common/
Author: trustin
Date: Thu Jun 30 22:31:51 2005
New Revision: 208717
URL: http://svn.apache.org/viewcvs?rev=208717&view=rev
Log:
Fix for DIRMINA-69
* Changed IoFilterChain.remove() to return the removed filter.
Modified:
directory/network/branches/0.7/src/java/org/apache/mina/io/AbstractIoFilterChain.java
directory/network/branches/0.7/src/java/org/apache/mina/io/IoFilterChain.java
directory/network/branches/0.7/src/java/org/apache/mina/protocol/AbstractProtocolFilterChain.java
directory/network/branches/0.7/src/java/org/apache/mina/protocol/ProtocolFilterChain.java
directory/network/trunk/src/java/org/apache/mina/common/AbstractIoFilterChain.java
directory/network/trunk/src/java/org/apache/mina/common/IoFilterChain.java
Modified: directory/network/branches/0.7/src/java/org/apache/mina/io/AbstractIoFilterChain.java
URL: http://svn.apache.org/viewcvs/directory/network/branches/0.7/src/java/org/apache/mina/io/AbstractIoFilterChain.java?rev=208717&r1=208716&r2=208717&view=diff
==============================================================================
--- directory/network/branches/0.7/src/java/org/apache/mina/io/AbstractIoFilterChain.java (original)
+++ directory/network/branches/0.7/src/java/org/apache/mina/io/AbstractIoFilterChain.java Thu Jun 30 22:31:51 2005
@@ -228,7 +228,7 @@
/**
* Removes the interceptor with the specified name from this chain.
*/
- public synchronized void remove( String name )
+ public synchronized IoFilter remove( String name )
{
Entry entry = checkOldName( name );
Entry prevEntry = entry.prevEntry;
@@ -239,6 +239,8 @@
name2entry.remove( name );
IoFilter filter = entry.filter;
filter2entry.remove( filter );
+
+ return filter;
}
Modified: directory/network/branches/0.7/src/java/org/apache/mina/io/IoFilterChain.java
URL: http://svn.apache.org/viewcvs/directory/network/branches/0.7/src/java/org/apache/mina/io/IoFilterChain.java?rev=208717&r1=208716&r2=208717&view=diff
==============================================================================
--- directory/network/branches/0.7/src/java/org/apache/mina/io/IoFilterChain.java (original)
+++ directory/network/branches/0.7/src/java/org/apache/mina/io/IoFilterChain.java Thu Jun 30 22:31:51 2005
@@ -11,6 +11,6 @@
void addLast( String name, IoFilter filter );
void addBefore( String baseName, String name, IoFilter filter );
void addAfter( String baseName, String name, IoFilter filter );
- void remove( String name );
+ IoFilter remove( String name );
void clear();
}
Modified: directory/network/branches/0.7/src/java/org/apache/mina/protocol/AbstractProtocolFilterChain.java
URL: http://svn.apache.org/viewcvs/directory/network/branches/0.7/src/java/org/apache/mina/protocol/AbstractProtocolFilterChain.java?rev=208717&r1=208716&r2=208717&view=diff
==============================================================================
--- directory/network/branches/0.7/src/java/org/apache/mina/protocol/AbstractProtocolFilterChain.java (original)
+++ directory/network/branches/0.7/src/java/org/apache/mina/protocol/AbstractProtocolFilterChain.java Thu Jun 30 22:31:51 2005
@@ -226,7 +226,7 @@
/**
* Removes the interceptor with the specified name from this chain.
*/
- public synchronized void remove( String name )
+ public synchronized ProtocolFilter remove( String name )
{
Entry entry = checkOldName( name );
Entry prevEntry = entry.prevEntry;
@@ -237,6 +237,8 @@
name2entry.remove( name );
ProtocolFilter filter = entry.filter;
filter2entry.remove( filter );
+
+ return filter;
}
Modified: directory/network/branches/0.7/src/java/org/apache/mina/protocol/ProtocolFilterChain.java
URL: http://svn.apache.org/viewcvs/directory/network/branches/0.7/src/java/org/apache/mina/protocol/ProtocolFilterChain.java?rev=208717&r1=208716&r2=208717&view=diff
==============================================================================
--- directory/network/branches/0.7/src/java/org/apache/mina/protocol/ProtocolFilterChain.java (original)
+++ directory/network/branches/0.7/src/java/org/apache/mina/protocol/ProtocolFilterChain.java Thu Jun 30 22:31:51 2005
@@ -11,6 +11,6 @@
void addLast( String name, ProtocolFilter filter );
void addBefore( String baseName, String name, ProtocolFilter filter );
void addAfter( String baseName, String name, ProtocolFilter filter );
- void remove( String name );
+ ProtocolFilter remove( String name );
void clear();
}
Modified: directory/network/trunk/src/java/org/apache/mina/common/AbstractIoFilterChain.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/common/AbstractIoFilterChain.java?rev=208717&r1=208716&r2=208717&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/common/AbstractIoFilterChain.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/common/AbstractIoFilterChain.java Thu Jun 30 22:31:51 2005
@@ -301,7 +301,7 @@
/**
* Removes the interceptor with the specified name from this chain.
*/
- public synchronized void remove( String name )
+ public synchronized IoFilter remove( String name )
{
Entry entry = checkOldName( name );
decreaseRefCnt( entry.filter );
@@ -314,6 +314,8 @@
name2entry.remove( name );
IoFilter filter = entry.filter;
filter2entry.remove( filter );
+
+ return filter;
}
Modified: directory/network/trunk/src/java/org/apache/mina/common/IoFilterChain.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/common/IoFilterChain.java?rev=208717&r1=208716&r2=208717&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/common/IoFilterChain.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/common/IoFilterChain.java Thu Jun 30 22:31:51 2005
@@ -11,6 +11,6 @@
void addLast( String name, IoFilter filter );
void addBefore( String baseName, String name, IoFilter filter );
void addAfter( String baseName, String name, IoFilter filter );
- void remove( String name );
+ IoFilter remove( String name );
void clear();
}