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 2006/11/20 07:35:00 UTC
svn commit: r477070 [1/2] - in /mina/trunk: ./
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/filter/codec/demux/ core/src/main...
Author: trustin
Date: Sun Nov 19 22:34:55 2006
New Revision: 477070
URL: http://svn.apache.org/viewvc?view=rev&rev=477070
Log:
Fixed all warnings resulted by -source 1.5 option
Removed:
mina/trunk/core/src/main/java/org/apache/mina/util/BlockingQueue.java
mina/trunk/core/src/main/java/org/apache/mina/util/Queue.java
mina/trunk/core/src/test/java/org/apache/mina/util/QueueTest.java
Modified:
mina/trunk/core/src/main/java/org/apache/mina/common/DefaultIoFilterChainBuilder.java
mina/trunk/core/src/main/java/org/apache/mina/common/ExecutorThreadModel.java
mina/trunk/core/src/main/java/org/apache/mina/common/ExpiringSessionRecycler.java
mina/trunk/core/src/main/java/org/apache/mina/common/IoFilterChain.java
mina/trunk/core/src/main/java/org/apache/mina/common/TransportType.java
mina/trunk/core/src/main/java/org/apache/mina/common/support/AbstractIoFilterChain.java
mina/trunk/core/src/main/java/org/apache/mina/common/support/BaseIoService.java
mina/trunk/core/src/main/java/org/apache/mina/common/support/BaseIoSession.java
mina/trunk/core/src/main/java/org/apache/mina/common/support/DefaultIoFuture.java
mina/trunk/core/src/main/java/org/apache/mina/common/support/IoServiceListenerSupport.java
mina/trunk/core/src/main/java/org/apache/mina/filter/BlacklistFilter.java
mina/trunk/core/src/main/java/org/apache/mina/filter/StreamWriteFilter.java
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolCodecFactory.java
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/MessageEncoder.java
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/support/SimpleProtocolDecoderOutput.java
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/support/SimpleProtocolEncoderOutput.java
mina/trunk/core/src/main/java/org/apache/mina/filter/executor/ExecutorFilter.java
mina/trunk/core/src/main/java/org/apache/mina/handler/chain/IoHandlerChain.java
mina/trunk/core/src/main/java/org/apache/mina/handler/demux/DemuxingIoHandler.java
mina/trunk/core/src/main/java/org/apache/mina/management/StatCollector.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketFilterChain.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketSessionImpl.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramAcceptorDelegate.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramConnectorDelegate.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramFilterChain.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramSessionImpl.java
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeAcceptor.java
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeFilterChain.java
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeIdleStatusChecker.java
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeSessionImpl.java
mina/trunk/core/src/main/java/org/apache/mina/util/AvailablePortFinder.java
mina/trunk/core/src/main/java/org/apache/mina/util/CharsetUtil.java
mina/trunk/core/src/main/java/org/apache/mina/util/ExpiringMap.java
mina/trunk/core/src/main/java/org/apache/mina/util/IdentityHashSet.java
mina/trunk/core/src/test/java/org/apache/mina/common/ByteBufferTest.java
mina/trunk/core/src/test/java/org/apache/mina/filter/StreamWriteFilterTest.java
mina/trunk/core/src/test/java/org/apache/mina/filter/codec/CumulativeProtocolDecoderTest.java
mina/trunk/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineDecoderTest.java
mina/trunk/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineEncoderTest.java
mina/trunk/example/src/main/java/org/apache/mina/example/chat/ChatProtocolHandler.java
mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpRequestDecoder.java
mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpResponseEncoder.java
mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpResponseMessage.java
mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/stream/HttpProtocolHandler.java
mina/trunk/example/src/main/java/org/apache/mina/example/sumup/codec/AddMessageEncoder.java
mina/trunk/example/src/main/java/org/apache/mina/example/sumup/codec/ResultMessageEncoder.java
mina/trunk/filter-ssl/src/main/java/org/apache/mina/filter/support/SSLHandler.java
mina/trunk/integration-jmx/src/main/java/org/apache/mina/integration/jmx/IoServiceManager.java
mina/trunk/integration-spring/src/main/java/org/apache/mina/integration/spring/ThreadPoolExecutorFactoryBean.java
mina/trunk/integration-spring/src/test/java/org/apache/mina/integration/spring/DefaultIoFilterChainBuilderFactoryBeanTest.java
mina/trunk/integration-spring/src/test/java/org/apache/mina/integration/spring/ExecutorThreadModelFactoryBeanTest.java
mina/trunk/pom.xml
Modified: mina/trunk/core/src/main/java/org/apache/mina/common/DefaultIoFilterChainBuilder.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/DefaultIoFilterChainBuilder.java?view=diff&rev=477070&r1=477069&r2=477070
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/DefaultIoFilterChainBuilder.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/DefaultIoFilterChainBuilder.java Sun Nov 19 22:34:55 2006
@@ -56,8 +56,8 @@
*/
public class DefaultIoFilterChainBuilder implements IoFilterChainBuilder, Cloneable
{
- private List entries = new ArrayList();
- private final Map entriesByName = new HashMap();
+ private List<Entry> entries = new ArrayList<Entry>();
+ private final Map<String, Entry> entriesByName = new HashMap<String, Entry>();
/**
* Creates a new instance with an empty filter list.
@@ -71,7 +71,7 @@
*/
public synchronized Entry getEntry( String name )
{
- return ( Entry ) entriesByName.get( name );
+ return entriesByName.get( name );
}
/**
@@ -93,7 +93,7 @@
*/
public List getAll()
{
- return new ArrayList( entries );
+ return new ArrayList<Entry>( entries );
}
/**
@@ -134,7 +134,7 @@
/**
* @see IoFilterChain#contains(Class)
*/
- public boolean contains( Class filterType )
+ public boolean contains( Class<? extends IoFilter> filterType )
{
for( Iterator i = entries.iterator(); i.hasNext(); )
{
@@ -189,11 +189,11 @@
{
checkBaseName( baseName );
- List entries = new ArrayList( this.entries );
+ List<Entry> entries = new ArrayList<Entry>( this.entries );
- for( ListIterator i = entries.listIterator(); i.hasNext(); )
+ for( ListIterator<Entry> i = entries.listIterator(); i.hasNext(); )
{
- Entry base = ( Entry ) i.next();
+ Entry base = i.next();
if( base.getName().equals( baseName ) )
{
register( i.nextIndex(), new EntryImpl( name, filter ) );
@@ -212,9 +212,9 @@
throw new NullPointerException( "name" );
}
- for( ListIterator i = entries.listIterator(); i.hasNext(); )
+ for( ListIterator<Entry> i = entries.listIterator(); i.hasNext(); )
{
- Entry e = ( Entry ) i.next();
+ Entry e = i.next();
if( e.getName().equals( name ) )
{
deregister( i.previousIndex(), e );
@@ -230,15 +230,15 @@
*/
public synchronized void clear() throws Exception
{
- entries = new ArrayList();
+ entries = new ArrayList<Entry>();
entriesByName.clear();
}
public void buildFilterChain( IoFilterChain chain ) throws Exception
{
- for( Iterator i = entries.iterator(); i.hasNext(); )
+ for( Iterator<Entry> i = entries.iterator(); i.hasNext(); )
{
- Entry e = ( Entry ) i.next();
+ Entry e = i.next();
chain.addLast( e.getName(), e.getFilter() );
}
}
@@ -250,9 +250,9 @@
boolean empty = true;
- for( Iterator i = entries.iterator(); i.hasNext(); )
+ for( Iterator<Entry> i = entries.iterator(); i.hasNext(); )
{
- Entry e = ( Entry ) i.next();
+ Entry e = i.next();
if( !empty )
{
buf.append( ", " );
@@ -309,7 +309,7 @@
throw new IllegalArgumentException( "Other filter is using the same name: " + e.getName() );
}
- List newEntries = new ArrayList( entries );
+ List<Entry> newEntries = new ArrayList<Entry>( entries );
newEntries.add( index, e );
this.entries = newEntries;
entriesByName.put( e.getName(), e );
@@ -317,7 +317,7 @@
private void deregister( int index, Entry e )
{
- List newEntries = new ArrayList( entries );
+ List<Entry> newEntries = new ArrayList<Entry>( entries );
newEntries.remove( index );
this.entries = newEntries;
entriesByName.remove( e.getName() );
Modified: mina/trunk/core/src/main/java/org/apache/mina/common/ExecutorThreadModel.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/ExecutorThreadModel.java?view=diff&rev=477070&r1=477069&r2=477070
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/ExecutorThreadModel.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/ExecutorThreadModel.java Sun Nov 19 22:34:55 2006
@@ -44,7 +44,8 @@
* Maps a service name to a PooledThreadModel instance.
* Without this map, we might create extremely many thread pools that leads the system to
* coma. */
- private static final Map service2model = new HashMap();
+ private static final Map<String, ExecutorThreadModel> service2model =
+ new HashMap<String, ExecutorThreadModel>();
/**
* Returns a {@link ExecutorThreadModel} instance for the specified <tt>serviceName</tt>.
@@ -64,7 +65,7 @@
ExecutorThreadModel model;
synchronized( service2model )
{
- model = ( ExecutorThreadModel ) service2model.get( serviceName );
+ model = service2model.get( serviceName );
if( model == null )
{
model = new ExecutorThreadModel( serviceName );
Modified: mina/trunk/core/src/main/java/org/apache/mina/common/ExpiringSessionRecycler.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/ExpiringSessionRecycler.java?view=diff&rev=477070&r1=477069&r2=477070
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/ExpiringSessionRecycler.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/ExpiringSessionRecycler.java Sun Nov 19 22:34:55 2006
@@ -111,7 +111,7 @@
private Object generateKey( SocketAddress localAddress, SocketAddress remoteAddress )
{
- List key = new ArrayList( 2 );
+ List<SocketAddress> key = new ArrayList<SocketAddress>( 2 );
key.add( remoteAddress );
key.add( localAddress );
return key;
Modified: mina/trunk/core/src/main/java/org/apache/mina/common/IoFilterChain.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/IoFilterChain.java?view=diff&rev=477070&r1=477069&r2=477070
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/IoFilterChain.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/IoFilterChain.java Sun Nov 19 22:34:55 2006
@@ -61,12 +61,12 @@
/**
* Returns the list of all {@link Entry}s this chain contains.
*/
- List getAll();
+ List<Entry> getAll();
/**
* Returns the reversed list of all {@link Entry}s this chain contains.
*/
- List getAllReversed();
+ List<Entry> getAllReversed();
/**
* Returns <tt>true</tt> if this chain contains an {@link IoFilter} with the
@@ -83,7 +83,7 @@
* Returns <tt>true</tt> if this chain contains an {@link IoFilter} of the
* specified <tt>filterType</tt>.
*/
- boolean contains( Class filterType );
+ boolean contains( Class<? extends IoFilter> filterType );
/**
* Adds the specified filter with the specified name at the beginning of this chain.
Modified: mina/trunk/core/src/main/java/org/apache/mina/common/TransportType.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/TransportType.java?view=diff&rev=477070&r1=477069&r2=477070
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/TransportType.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/TransportType.java Sun Nov 19 22:34:55 2006
@@ -47,7 +47,7 @@
{
private static final long serialVersionUID = 3258132470497883447L;
- private static final Map name2type = new HashMap();
+ private static final Map<String, TransportType> name2type = new HashMap<String, TransportType>();
private static void register( String[] names, TransportType type )
{
@@ -101,7 +101,7 @@
*/
public static TransportType getInstance( String name )
{
- TransportType type = (TransportType) name2type.get( name.toUpperCase() );
+ TransportType type = name2type.get( name.toUpperCase() );
if( type != null )
{
return type;
@@ -114,7 +114,7 @@
private final transient boolean connectionless;
- private final transient Class envelopeType;
+ private final transient Class<? extends Object> envelopeType;
/**
* Creates a new instance. New transport type is automatically registered
@@ -139,7 +139,7 @@
*
* @throws IllegalArgumentException if <tt>names</tt> are already registered or empty
*/
- public TransportType( String[] names, Class envelopeType, boolean connectionless )
+ public TransportType( String[] names, Class<? extends Object> envelopeType, boolean connectionless )
{
if( names == null )
{
@@ -179,7 +179,7 @@
return connectionless;
}
- public Class getEnvelopeType()
+ public Class<? extends Object> getEnvelopeType()
{
return envelopeType;
}
@@ -187,9 +187,9 @@
/**
* Returns the known names of this transport type.
*/
- public Set getNames()
+ public Set<String> getNames()
{
- Set result = new TreeSet();
+ Set<String> result = new TreeSet<String>();
for( int i = names.length - 1; i >= 0; i -- )
{
result.add( names[ i ] );
Modified: mina/trunk/core/src/main/java/org/apache/mina/common/support/AbstractIoFilterChain.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/support/AbstractIoFilterChain.java?view=diff&rev=477070&r1=477069&r2=477070
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/support/AbstractIoFilterChain.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/support/AbstractIoFilterChain.java Sun Nov 19 22:34:55 2006
@@ -63,7 +63,7 @@
AbstractIoFilterChain.class.getName() + ".connectFuture";
private final IoSession session;
- private final Map name2entry = new HashMap();
+ private final Map<String, Entry> name2entry = new HashMap<String, Entry>();
private final EntryImpl head;
private final EntryImpl tail;
@@ -87,7 +87,7 @@
public Entry getEntry( String name )
{
- Entry e = ( Entry ) name2entry.get( name );
+ Entry e = name2entry.get( name );
if ( e == null )
{
return null;
@@ -158,10 +158,10 @@
public synchronized void clear() throws Exception
{
- Iterator it = new ArrayList( name2entry.keySet() ).iterator();
+ Iterator<String> it = new ArrayList<String>( name2entry.keySet() ).iterator();
while ( it.hasNext() )
{
- this.remove( ( String ) it.next() );
+ this.remove( it.next() );
}
}
@@ -469,9 +469,9 @@
}
}
- public List getAll()
+ public List<Entry> getAll()
{
- List list = new ArrayList();
+ List<Entry> list = new ArrayList<Entry>();
EntryImpl e = head.nextEntry;
while( e != tail )
{
@@ -482,9 +482,9 @@
return list;
}
- public List getAllReversed()
+ public List<Entry> getAllReversed()
{
- List list = new ArrayList();
+ List<Entry> list = new ArrayList<Entry>();
EntryImpl e = tail.prevEntry;
while( e != head )
{
@@ -513,7 +513,7 @@
return false;
}
- public boolean contains( Class filterType )
+ public boolean contains( Class<? extends IoFilter> filterType )
{
EntryImpl e = head.nextEntry;
while( e != tail )
Modified: mina/trunk/core/src/main/java/org/apache/mina/common/support/BaseIoService.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/support/BaseIoService.java?view=diff&rev=477070&r1=477069&r2=477070
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/support/BaseIoService.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/support/BaseIoService.java Sun Nov 19 22:34:55 2006
@@ -71,7 +71,7 @@
/**
* Returns the type of {@link SocketAddress} this service uses.
*/
- protected abstract Class getAddressType();
+ protected abstract Class<? extends SocketAddress> getAddressType();
public IoFilterChainBuilder getFilterChainBuilder()
{
Modified: mina/trunk/core/src/main/java/org/apache/mina/common/support/BaseIoSession.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/support/BaseIoSession.java?view=diff&rev=477070&r1=477069&r2=477070
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/support/BaseIoSession.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/support/BaseIoSession.java Sun Nov 19 22:34:55 2006
@@ -42,7 +42,7 @@
*/
public abstract class BaseIoSession implements IoSession
{
- private final Map attributes = new HashMap();
+ private final Map<String, Object> attributes = new HashMap<String, Object>();
private final long creationTime;
/**
@@ -211,11 +211,11 @@
return getAttribute( key ) != null;
}
- public Set getAttributeKeys()
+ public Set<String> getAttributeKeys()
{
synchronized( attributes )
{
- return new HashSet( attributes.keySet() );
+ return new HashSet<String>( attributes.keySet() );
}
}
Modified: mina/trunk/core/src/main/java/org/apache/mina/common/support/DefaultIoFuture.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/support/DefaultIoFuture.java?view=diff&rev=477070&r1=477069&r2=477070
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/support/DefaultIoFuture.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/support/DefaultIoFuture.java Sun Nov 19 22:34:55 2006
@@ -37,7 +37,7 @@
{
private final IoSession session;
private final Object lock;
- private final List listeners = new ArrayList();
+ private final List<IoFutureListener> listeners = new ArrayList<IoFutureListener>();
private Object result;
private boolean ready;
Modified: mina/trunk/core/src/main/java/org/apache/mina/common/support/IoServiceListenerSupport.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/support/IoServiceListenerSupport.java?view=diff&rev=477070&r1=477069&r2=477070
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/support/IoServiceListenerSupport.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/support/IoServiceListenerSupport.java Sun Nov 19 22:34:55 2006
@@ -50,12 +50,12 @@
/**
* A list of {@link IoServiceListener}s.
*/
- private final List listeners = new ArrayList();
+ private final List<IoServiceListener> listeners = new ArrayList<IoServiceListener>();
/**
* Tracks managed sesssions.
*/
- private final Set managedSessions = new IdentityHashSet();
+ private final Set<IoSession> managedSessions = new IdentityHashSet<IoSession>();
private boolean activated;
@@ -97,7 +97,7 @@
{
synchronized( managedSessions )
{
- return new IdentityHashSet( managedSessions );
+ return new IdentityHashSet<IoSession>( managedSessions );
}
}
@@ -263,7 +263,7 @@
Set sessionsCopy;
synchronized( managedSessions )
{
- sessionsCopy = new IdentityHashSet( managedSessions );
+ sessionsCopy = new IdentityHashSet<IoSession>( managedSessions );
}
for( Iterator i = sessionsCopy.iterator(); i.hasNext(); )
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/BlacklistFilter.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/BlacklistFilter.java?view=diff&rev=477070&r1=477069&r2=477070
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/BlacklistFilter.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/BlacklistFilter.java Sun Nov 19 22:34:55 2006
@@ -41,7 +41,7 @@
*/
public class BlacklistFilter extends IoFilterAdapter
{
- private final Set blacklist = new HashSet();
+ private final Set<InetAddress> blacklist = new HashSet<InetAddress>();
/**
* Sets the addresses to be blacklisted.
@@ -72,7 +72,7 @@
* @throws IllegalArgumentException if the specified collections contains
* non-{@link InetAddress} objects.
*/
- public void setBlacklist( Collection addresses )
+ public void setBlacklist( Collection<InetAddress> addresses )
{
if( addresses == null )
throw new NullPointerException( "addresses" );
@@ -80,7 +80,7 @@
InetAddress[] inetAddresses = new InetAddress[ addresses.size() ];
try
{
- setBlacklist( ( InetAddress[] ) addresses.toArray( inetAddresses ) );
+ setBlacklist( addresses.toArray( inetAddresses ) );
}
catch ( ArrayStoreException ase )
{
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/StreamWriteFilter.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/StreamWriteFilter.java?view=diff&rev=477070&r1=477069&r2=477070
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/StreamWriteFilter.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/StreamWriteFilter.java Sun Nov 19 22:34:55 2006
@@ -21,12 +21,13 @@
import java.io.IOException;
import java.io.InputStream;
+import java.util.LinkedList;
+import java.util.Queue;
import org.apache.mina.common.ByteBuffer;
import org.apache.mina.common.IoFilterAdapter;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.WriteFuture;
-import org.apache.mina.util.Queue;
/**
* Filter implementation which makes it possible to write {@link InputStream}
@@ -70,19 +71,20 @@
private int writeBufferSize = DEFAULT_STREAM_BUFFER_SIZE;
+ @SuppressWarnings("unchecked")
public void filterWrite( NextFilter nextFilter, IoSession session,
WriteRequest writeRequest ) throws Exception
{
// If we're already processing a stream we need to queue the WriteRequest.
if( session.getAttribute( CURRENT_STREAM ) != null )
{
- Queue queue = ( Queue ) session.getAttribute( WRITE_REQUEST_QUEUE );
+ Queue<WriteRequest> queue = ( Queue<WriteRequest> ) session.getAttribute( WRITE_REQUEST_QUEUE );
if( queue == null )
{
- queue = new Queue();
+ queue = new LinkedList<WriteRequest>();
session.setAttribute( WRITE_REQUEST_QUEUE, queue );
}
- queue.push( writeRequest );
+ queue.offer( writeRequest );
return;
}
@@ -137,11 +139,11 @@
Queue queue = ( Queue ) session.removeAttribute( WRITE_REQUEST_QUEUE );
if( queue != null )
{
- WriteRequest wr = ( WriteRequest ) queue.pop();
+ WriteRequest wr = ( WriteRequest ) queue.poll();
while( wr != null )
{
filterWrite( nextFilter, session, wr );
- wr = ( WriteRequest ) queue.pop();
+ wr = ( WriteRequest ) queue.poll();
}
}
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolCodecFactory.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolCodecFactory.java?view=diff&rev=477070&r1=477069&r2=477070
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolCodecFactory.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolCodecFactory.java Sun Nov 19 22:34:55 2006
@@ -170,7 +170,7 @@
private class ProtocolEncoderImpl implements ProtocolEncoder
{
- private final Map encoders = new IdentityHashMap();
+ private final Map<Class, MessageEncoder> encoders = new IdentityHashMap<Class, MessageEncoder>();
private ProtocolEncoderImpl() throws Exception
{
@@ -202,16 +202,16 @@
private MessageEncoder findEncoder( Class type )
{
- MessageEncoder encoder = ( MessageEncoder ) encoders.get( type );
+ MessageEncoder encoder = encoders.get( type );
if( encoder == null )
{
- encoder = findEncoder( type, new IdentityHashSet() );
+ encoder = findEncoder( type, new IdentityHashSet<Class>() );
}
return encoder;
}
- private MessageEncoder findEncoder( Class type, Set triedClasses )
+ private MessageEncoder findEncoder( Class type, Set<Class> triedClasses )
{
MessageEncoder encoder;
@@ -219,7 +219,7 @@
return null;
triedClasses.add( type );
- encoder = ( MessageEncoder ) encoders.get( type );
+ encoder = encoders.get( type );
if( encoder == null )
{
encoder = findEncoder( type, triedClasses );
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/MessageEncoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/MessageEncoder.java?view=diff&rev=477070&r1=477069&r2=477070
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/MessageEncoder.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/MessageEncoder.java Sun Nov 19 22:34:55 2006
@@ -39,7 +39,7 @@
/**
* Returns the set of message classes this encoder can encode.
*/
- Set getMessageTypes();
+ Set<Class> getMessageTypes();
/**
* Encodes higher-level message objects into binary or protocol-specific data.
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/support/SimpleProtocolDecoderOutput.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/support/SimpleProtocolDecoderOutput.java?view=diff&rev=477070&r1=477069&r2=477070
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/support/SimpleProtocolDecoderOutput.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/support/SimpleProtocolDecoderOutput.java Sun Nov 19 22:34:55 2006
@@ -19,11 +19,13 @@
*/
package org.apache.mina.filter.codec.support;
+import java.util.LinkedList;
+import java.util.Queue;
+
import org.apache.mina.common.IoSession;
import org.apache.mina.common.IoFilter.NextFilter;
import org.apache.mina.common.support.BaseIoSession;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
-import org.apache.mina.util.Queue;
/**
* A {@link ProtocolDecoderOutput} based on queue.
@@ -36,7 +38,7 @@
{
private final NextFilter nextFilter;
private final IoSession session;
- private final Queue messageQueue = new Queue();
+ private final Queue<Object> messageQueue = new LinkedList<Object>();
public SimpleProtocolDecoderOutput( IoSession session, NextFilter nextFilter )
{
@@ -46,7 +48,7 @@
public void write( Object message )
{
- messageQueue.push( message );
+ messageQueue.offer( message );
if( session instanceof BaseIoSession )
{
( ( BaseIoSession ) session ).increaseReadMessages();
@@ -57,7 +59,7 @@
{
while( !messageQueue.isEmpty() )
{
- nextFilter.messageReceived( session, messageQueue.pop() );
+ nextFilter.messageReceived( session, messageQueue.poll() );
}
}
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/support/SimpleProtocolEncoderOutput.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/support/SimpleProtocolEncoderOutput.java?view=diff&rev=477070&r1=477069&r2=477070
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/support/SimpleProtocolEncoderOutput.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/support/SimpleProtocolEncoderOutput.java Sun Nov 19 22:34:55 2006
@@ -19,10 +19,12 @@
*/
package org.apache.mina.filter.codec.support;
+import java.util.LinkedList;
+import java.util.Queue;
+
import org.apache.mina.common.ByteBuffer;
import org.apache.mina.common.WriteFuture;
import org.apache.mina.filter.codec.ProtocolEncoderOutput;
-import org.apache.mina.util.Queue;
/**
* A {@link ProtocolEncoderOutput} based on queue.
@@ -32,7 +34,7 @@
*/
public abstract class SimpleProtocolEncoderOutput implements ProtocolEncoderOutput
{
- private final Queue bufferQueue = new Queue();
+ private final Queue<ByteBuffer> bufferQueue = new LinkedList<ByteBuffer>();
public SimpleProtocolEncoderOutput()
{
@@ -45,7 +47,7 @@
public void write( ByteBuffer buf )
{
- bufferQueue.push( buf );
+ bufferQueue.offer( buf );
}
public void mergeAll()
@@ -60,9 +62,9 @@
}
// Get the size of merged BB
- for( int i = size - 1; i >= 0; i -- )
+ for( Object o: bufferQueue )
{
- sum += ( ( ByteBuffer ) bufferQueue.get( i ) ).remaining();
+ sum += ( ( ByteBuffer ) o ).remaining();
}
// Allocate a new BB that will contain all fragments
@@ -71,7 +73,7 @@
// and merge all.
for( ;; )
{
- ByteBuffer buf = ( ByteBuffer ) bufferQueue.pop();
+ ByteBuffer buf = bufferQueue.poll();
if( buf == null )
{
break;
@@ -83,7 +85,7 @@
// Push the new buffer finally.
newBuf.flip();
- bufferQueue.push(newBuf);
+ bufferQueue.offer(newBuf);
}
public WriteFuture flush()
@@ -98,7 +100,7 @@
{
for( ;; )
{
- ByteBuffer buf = ( ByteBuffer ) bufferQueue.pop();
+ ByteBuffer buf = ( ByteBuffer ) bufferQueue.poll();
if( buf == null )
{
break;
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/executor/ExecutorFilter.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/executor/ExecutorFilter.java?view=diff&rev=477070&r1=477069&r2=477070
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/executor/ExecutorFilter.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/executor/ExecutorFilter.java Sun Nov 19 22:34:55 2006
@@ -19,8 +19,8 @@
*/
package org.apache.mina.filter.executor;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.LinkedList;
+import java.util.Queue;
import java.util.concurrent.Executor;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ThreadPoolExecutor;
@@ -59,7 +59,7 @@
*/
public ExecutorFilter()
{
- this( new ThreadPoolExecutor(16, 16, 60, TimeUnit.SECONDS, new LinkedBlockingQueue() ) );
+ this( new ThreadPoolExecutor(16, 16, 60, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>() ) );
}
/**
@@ -91,7 +91,7 @@
synchronized( buf.eventQueue )
{
- buf.eventQueue.add( event );
+ buf.eventQueue.offer( event );
if( buf.processingCompleted )
{
buf.processingCompleted = false;
@@ -123,7 +123,7 @@
}
private final IoSession session;
- private final List eventQueue = new ArrayList();
+ private final Queue<Event> eventQueue = new LinkedList<Event>();
private boolean processingCompleted = true;
private SessionBuffer( IoSession session )
@@ -298,7 +298,7 @@
break;
}
- event = ( Event ) buffer.eventQueue.remove( 0 );
+ event = buffer.eventQueue.poll();
}
processEvent( event.getNextFilter(), buffer.session, event.getType(), event.getData() );
Modified: mina/trunk/core/src/main/java/org/apache/mina/handler/chain/IoHandlerChain.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/handler/chain/IoHandlerChain.java?view=diff&rev=477070&r1=477069&r2=477070
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/handler/chain/IoHandlerChain.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/handler/chain/IoHandlerChain.java Sun Nov 19 22:34:55 2006
@@ -39,7 +39,7 @@
private final int id = nextId++;
private final String NEXT_COMMAND = IoHandlerChain.class.getName() + '.' + id + ".nextCommand";
- private final Map name2entry = new HashMap();
+ private final Map<String, Entry> name2entry = new HashMap<String, Entry>();
private final Entry head;
private final Entry tail;
@@ -82,7 +82,7 @@
public Entry getEntry( String name )
{
- Entry e = ( Entry ) name2entry.get( name );
+ Entry e = name2entry.get( name );
if ( e == null )
{
return null;
@@ -153,10 +153,10 @@
public synchronized void clear() throws Exception
{
- Iterator it = new ArrayList( name2entry.keySet() ).iterator();
+ Iterator<String> it = new ArrayList<String>( name2entry.keySet() ).iterator();
while ( it.hasNext() )
{
- this.remove( ( String ) it.next() );
+ this.remove( it.next() );
}
}
@@ -186,7 +186,7 @@
*/
private Entry checkOldName( String baseName )
{
- Entry e = ( Entry ) name2entry.get( baseName );
+ Entry e = name2entry.get( baseName );
if ( e == null )
{
throw new IllegalArgumentException( "Unknown filter name:" +
@@ -231,7 +231,7 @@
public List getAll()
{
- List list = new ArrayList();
+ List<Entry> list = new ArrayList<Entry>();
Entry e = head.nextEntry;
while( e != tail )
{
@@ -244,7 +244,7 @@
public List getAllReversed()
{
- List list = new ArrayList();
+ List<Entry> list = new ArrayList<Entry>();
Entry e = tail.prevEntry;
while( e != head )
{
@@ -273,7 +273,7 @@
return false;
}
- public boolean contains( Class commandType )
+ public boolean contains( Class<? extends IoHandlerCommand> commandType )
{
Entry e = head.nextEntry;
while( e != tail )
Modified: mina/trunk/core/src/main/java/org/apache/mina/handler/demux/DemuxingIoHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/handler/demux/DemuxingIoHandler.java?view=diff&rev=477070&r1=477069&r2=477070
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/handler/demux/DemuxingIoHandler.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/handler/demux/DemuxingIoHandler.java Sun Nov 19 22:34:55 2006
@@ -78,8 +78,10 @@
*/
public class DemuxingIoHandler extends IoHandlerAdapter
{
- private final Map findHandlerCache = new Hashtable();
- private final Map type2handler = new Hashtable();
+ private final Map<Class, MessageHandler> findHandlerCache =
+ new Hashtable<Class, MessageHandler>();
+ private final Map<Class, MessageHandler> type2handler =
+ new Hashtable<Class, MessageHandler>();
/**
* Creates a new instance with no registered {@link MessageHandler}s.
@@ -98,7 +100,7 @@
public MessageHandler addMessageHandler( Class type, MessageHandler handler )
{
findHandlerCache.clear();
- return ( MessageHandler ) type2handler.put( type, handler );
+ return type2handler.put( type, handler );
}
/**
@@ -110,7 +112,7 @@
public MessageHandler removeMessageHandler( Class type )
{
findHandlerCache.clear();
- return ( MessageHandler ) type2handler.remove( type );
+ return type2handler.remove( type );
}
@@ -120,7 +122,7 @@
*/
public MessageHandler getMessageHandler( Class type )
{
- return ( MessageHandler ) type2handler.get( type );
+ return type2handler.get( type );
}
/**
@@ -155,7 +157,7 @@
return findHandler( type, null );
}
- private MessageHandler findHandler( Class type, Set triedClasses )
+ private MessageHandler findHandler( Class type, Set<Class> triedClasses )
{
MessageHandler handler = null;
@@ -165,14 +167,14 @@
/*
* Try the cache first.
*/
- handler = ( MessageHandler ) findHandlerCache.get( type );
+ handler = findHandlerCache.get( type );
if( handler != null )
return handler;
/*
* Try the registered handlers for an immediate match.
*/
- handler = ( MessageHandler ) type2handler.get( type );
+ handler = type2handler.get( type );
if( handler == null )
{
@@ -181,7 +183,7 @@
*/
if( triedClasses == null )
- triedClasses = new IdentityHashSet();
+ triedClasses = new IdentityHashSet<Class>();
triedClasses.add( type );
Class[] interfaces = type.getInterfaces();
Modified: mina/trunk/core/src/main/java/org/apache/mina/management/StatCollector.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/management/StatCollector.java?view=diff&rev=477070&r1=477069&r2=477070
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/management/StatCollector.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/management/StatCollector.java Sun Nov 19 22:34:55 2006
@@ -63,7 +63,7 @@
private final IoService service;
private Worker worker;
private int pollingInterval = 5000;
- private List polledSessions;
+ private List<IoSession> polledSessions;
// resume of session stats, for simplifying acces to the statistics
private long totalProcessedSessions = 0L;
@@ -126,7 +126,7 @@
// add all current sessions
- polledSessions = new ArrayList();
+ polledSessions = new ArrayList<IoSession>();
for ( Iterator iter = service.getManagedSessions().iterator(); iter.hasNext(); )
{
@@ -193,10 +193,10 @@
{
synchronized (this)
{
- totalProcessedSessions += 1;
- polledSessions.add( session );
- session.setAttribute( KEY, new IoSessionStat() );
- }
+ totalProcessedSessions += 1;
+ polledSessions.add( session );
+ session.setAttribute( KEY, new IoSessionStat() );
+ }
}
private void removeSession( IoSession session )
@@ -204,22 +204,21 @@
synchronized (this)
{
- // remove the session from the list of polled sessions
- polledSessions.remove( session );
+ // remove the session from the list of polled sessions
+ polledSessions.remove( session );
- // add the bytes processed between last polling and session closing
- // prevent non seen byte with non-connected protocols like HTTP and datagrams
- IoSessionStat sessStat = ( IoSessionStat ) session.getAttribute( KEY );
+ // add the bytes processed between last polling and session closing
+ // prevent non seen byte with non-connected protocols like HTTP and datagrams
+ IoSessionStat sessStat = ( IoSessionStat ) session.getAttribute( KEY );
- // computing with time between polling and closing
- bytesReadThroughput += ( (float) (session.getReadBytes() - sessStat.lastByteRead) ) / ( ( System.currentTimeMillis() - sessStat.lastPollingTime ) /1000f ) ;
- bytesWrittenThroughput += ( (float) (session.getWrittenBytes() - sessStat.lastByteWrite) ) / ( ( System.currentTimeMillis() - sessStat.lastPollingTime ) /1000f ) ;
- msgReadThroughput += ( (float) (session.getReadMessages() - sessStat.lastMessageRead) ) / ( ( System.currentTimeMillis() - sessStat.lastPollingTime ) /1000f ) ;
- msgWrittenThroughput += ( (float) (session.getWrittenMessages() - sessStat.lastMessageWrite) ) / ( ( System.currentTimeMillis() - sessStat.lastPollingTime ) /1000f ) ;
-
+ // computing with time between polling and closing
+ bytesReadThroughput += (session.getReadBytes() - sessStat.lastByteRead) / ( ( System.currentTimeMillis() - sessStat.lastPollingTime ) /1000f ) ;
+ bytesWrittenThroughput += (session.getWrittenBytes() - sessStat.lastByteWrite) / ( ( System.currentTimeMillis() - sessStat.lastPollingTime ) /1000f ) ;
+ msgReadThroughput += (session.getReadMessages() - sessStat.lastMessageRead) / ( ( System.currentTimeMillis() - sessStat.lastPollingTime ) /1000f ) ;
+ msgWrittenThroughput += (session.getWrittenMessages() - sessStat.lastMessageWrite) / ( ( System.currentTimeMillis() - sessStat.lastPollingTime ) /1000f ) ;
+
session.removeAttribute( KEY );
-
- }
+ }
}
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java?view=diff&rev=477070&r1=477069&r2=477070
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java Sun Nov 19 22:34:55 2006
@@ -28,6 +28,8 @@
import java.nio.channels.ServerSocketChannel;
import java.nio.channels.SocketChannel;
import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.Queue;
import java.util.Set;
import java.util.concurrent.Executor;
@@ -40,7 +42,6 @@
import org.apache.mina.common.support.IoServiceListenerSupport;
import org.apache.mina.util.NamePreservingRunnable;
import org.apache.mina.util.NewThreadExecutor;
-import org.apache.mina.util.Queue;
/**
* {@link IoAcceptor} for socket transport (TCP/IP).
@@ -65,8 +66,8 @@
private final String threadName = "SocketAcceptor-" + id;
private ServerSocketChannel serverSocketChannel;
- private final Queue registerQueue = new Queue();
- private final Queue cancelQueue = new Queue();
+ private final Queue<RegistrationRequest> registerQueue = new LinkedList<RegistrationRequest>();
+ private final Queue<CancellationRequest> cancelQueue = new LinkedList<CancellationRequest>();
private final SocketIoProcessor[] ioProcessors;
private final int processorCount;
@@ -136,7 +137,7 @@
}
}
- protected Class getAddressType()
+ protected Class<? extends SocketAddress> getAddressType()
{
return InetSocketAddress.class;
}
@@ -196,7 +197,7 @@
synchronized( registerQueue )
{
- registerQueue.push( request );
+ registerQueue.offer( request );
}
startupWorker();
@@ -277,7 +278,7 @@
synchronized( cancelQueue )
{
- cancelQueue.push( request );
+ cancelQueue.offer( request );
}
selector.wakeup();
@@ -434,7 +435,7 @@
synchronized( registerQueue )
{
- req = ( RegistrationRequest ) registerQueue.pop();
+ req = registerQueue.poll();
}
if( req == null )
@@ -505,7 +506,7 @@
synchronized( cancelQueue )
{
- request = ( CancellationRequest ) cancelQueue.pop();
+ request = cancelQueue.poll();
}
if( request == null )
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java?view=diff&rev=477070&r1=477069&r2=477070
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java Sun Nov 19 22:34:55 2006
@@ -27,6 +27,8 @@
import java.nio.channels.Selector;
import java.nio.channels.SocketChannel;
import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.Queue;
import java.util.Set;
import java.util.concurrent.Executor;
@@ -40,7 +42,6 @@
import org.apache.mina.common.support.IoServiceListenerSupport;
import org.apache.mina.util.NamePreservingRunnable;
import org.apache.mina.util.NewThreadExecutor;
-import org.apache.mina.util.Queue;
/**
* {@link IoConnector} for socket transport (TCP/IP).
@@ -60,7 +61,7 @@
private final Object lock = new Object();
private final int id = nextId++;
private final String threadName = "SocketConnector-" + id;
- private final Queue connectQueue = new Queue();
+ private final Queue<ConnectionRequest> connectQueue = new LinkedList<ConnectionRequest>();
private final SocketIoProcessor[] ioProcessors;
private final int processorCount;
private final Executor executor;
@@ -104,7 +105,7 @@
}
}
- protected Class getAddressType()
+ protected Class<? extends SocketAddress> getAddressType()
{
return InetSocketAddress.class;
}
@@ -206,7 +207,7 @@
synchronized( connectQueue )
{
- connectQueue.push( request );
+ connectQueue.offer( request );
}
selector.wakeup();
@@ -233,7 +234,7 @@
ConnectionRequest req;
synchronized( connectQueue )
{
- req = ( ConnectionRequest ) connectQueue.pop();
+ req = connectQueue.poll();
}
if( req == null )
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketFilterChain.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketFilterChain.java?view=diff&rev=477070&r1=477069&r2=477070
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketFilterChain.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketFilterChain.java Sun Nov 19 22:34:55 2006
@@ -20,13 +20,13 @@
package org.apache.mina.transport.socket.nio;
import java.io.IOException;
+import java.util.Queue;
import org.apache.mina.common.ByteBuffer;
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.IoFilter.WriteRequest;
import org.apache.mina.common.support.AbstractIoFilterChain;
-import org.apache.mina.util.Queue;
/**
* An {@link IoFilterChain} for socket transport (TCP/IP).
@@ -43,14 +43,14 @@
protected void doWrite( IoSession session, WriteRequest writeRequest )
{
SocketSessionImpl s = ( SocketSessionImpl ) session;
- Queue writeRequestQueue = s.getWriteRequestQueue();
+ Queue<WriteRequest> writeRequestQueue = s.getWriteRequestQueue();
// SocketIoProcessor.doFlush() will reset it after write is finished
// because the buffer will be passed with messageSent event.
( ( ByteBuffer ) writeRequest.getMessage() ).mark();
synchronized( writeRequestQueue )
{
- writeRequestQueue.push( writeRequest );
+ writeRequestQueue.offer( writeRequest );
if( writeRequestQueue.size() == 1 && session.getTrafficMask().isWritable() )
{
// Notify SocketIoProcessor only when writeRequestQueue was empty.
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java?view=diff&rev=477070&r1=477069&r2=477070
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java Sun Nov 19 22:34:55 2006
@@ -24,6 +24,8 @@
import java.nio.channels.Selector;
import java.nio.channels.SocketChannel;
import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.Queue;
import java.util.Set;
import java.util.concurrent.Executor;
@@ -36,7 +38,6 @@
import org.apache.mina.common.IoFilter.WriteRequest;
import org.apache.mina.common.support.IoServiceListenerSupport;
import org.apache.mina.util.NamePreservingRunnable;
-import org.apache.mina.util.Queue;
/**
* Performs all I/O operations for sockets which is connected or bound. This class is used by MINA internally.
@@ -55,10 +56,10 @@
*/
private Selector selector;
- private final Queue newSessions = new Queue();
- private final Queue removingSessions = new Queue();
- private final Queue flushingSessions = new Queue();
- private final Queue trafficControllingSessions = new Queue();
+ private final Queue<SocketSessionImpl> newSessions = new LinkedList<SocketSessionImpl>();
+ private final Queue<SocketSessionImpl> removingSessions = new LinkedList<SocketSessionImpl>();
+ private final Queue<SocketSessionImpl> flushingSessions = new LinkedList<SocketSessionImpl>();
+ private final Queue<SocketSessionImpl> trafficControllingSessions = new LinkedList<SocketSessionImpl>();
private Worker worker;
private long lastIdleCheckTime = System.currentTimeMillis();
@@ -73,7 +74,7 @@
{
synchronized( newSessions )
{
- newSessions.push( session );
+ newSessions.offer( session );
}
startupWorker();
@@ -125,7 +126,7 @@
{
synchronized( removingSessions )
{
- removingSessions.push( session );
+ removingSessions.offer( session );
}
}
@@ -133,7 +134,7 @@
{
synchronized( flushingSessions )
{
- flushingSessions.push( session );
+ flushingSessions.offer( session );
}
}
@@ -141,7 +142,7 @@
{
synchronized( trafficControllingSessions )
{
- trafficControllingSessions.push( session );
+ trafficControllingSessions.offer( session );
}
}
@@ -156,7 +157,7 @@
synchronized( newSessions )
{
- session = ( SocketSessionImpl ) newSessions.pop();
+ session = newSessions.poll();
}
if( session == null )
@@ -207,7 +208,7 @@
synchronized( removingSessions )
{
- session = ( SocketSessionImpl ) removingSessions.pop();
+ session = removingSessions.poll();
}
if( session == null )
@@ -396,7 +397,7 @@
synchronized( flushingSessions )
{
- session = ( SocketSessionImpl ) flushingSessions.pop();
+ session = flushingSessions.poll();
}
if( session == null )
@@ -440,7 +441,7 @@
Queue writeRequestQueue = session.getWriteRequestQueue();
WriteRequest req;
- while( ( req = ( WriteRequest ) writeRequestQueue.pop() ) != null )
+ while( ( req = ( WriteRequest ) writeRequestQueue.poll() ) != null )
{
try
{
@@ -472,7 +473,7 @@
synchronized( writeRequestQueue )
{
- req = ( WriteRequest ) writeRequestQueue.first();
+ req = ( WriteRequest ) writeRequestQueue.peek();
}
if( req == null )
@@ -483,7 +484,7 @@
{
synchronized( writeRequestQueue )
{
- writeRequestQueue.pop();
+ writeRequestQueue.poll();
}
session.increaseWrittenMessages();
@@ -519,7 +520,7 @@
synchronized( trafficControllingSessions )
{
- session = ( SocketSessionImpl ) trafficControllingSessions.pop();
+ session = trafficControllingSessions.poll();
}
if( session == null )
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketSessionImpl.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketSessionImpl.java?view=diff&rev=477070&r1=477069&r2=477070
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketSessionImpl.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketSessionImpl.java Sun Nov 19 22:34:55 2006
@@ -23,7 +23,10 @@
import java.net.SocketException;
import java.nio.channels.SelectionKey;
import java.nio.channels.SocketChannel;
+import java.util.LinkedList;
+import java.util.Queue;
+import org.apache.mina.common.ByteBuffer;
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoService;
@@ -34,7 +37,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.util.Queue;
/**
* An {@link IoSession} for socket transport (TCP/IP).
@@ -49,7 +51,7 @@
private final SocketIoProcessor ioProcessor;
private final SocketFilterChain filterChain;
private final SocketChannel ch;
- private final Queue writeRequestQueue;
+ private final Queue<WriteRequest> writeRequestQueue;
private final IoHandler handler;
private SelectionKey key;
private int readBufferSize;
@@ -64,7 +66,7 @@
this.ioProcessor = ioProcessor;
this.filterChain = new SocketFilterChain( this );
this.ch = ch;
- this.writeRequestQueue = new Queue();
+ this.writeRequestQueue = new LinkedList<WriteRequest>();
this.handler = service.getHandler();
// Apply the initial session settings
@@ -133,7 +135,7 @@
filterChain.fireFilterClose( this );
}
- Queue getWriteRequestQueue()
+ Queue<WriteRequest> getWriteRequestQueue()
{
return writeRequestQueue;
}
@@ -148,10 +150,19 @@
public int getScheduledWriteBytes()
{
+ int size = 0;
synchronized( writeRequestQueue )
{
- return writeRequestQueue.byteSize();
+ for( Object o: writeRequestQueue )
+ {
+ if( o instanceof ByteBuffer )
+ {
+ size += ( ( ByteBuffer ) o ).remaining();
+ }
+ }
}
+
+ return size;
}
protected void write0( WriteRequest writeRequest )
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramAcceptorDelegate.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramAcceptorDelegate.java?view=diff&rev=477070&r1=477069&r2=477070
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramAcceptorDelegate.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramAcceptorDelegate.java Sun Nov 19 22:34:55 2006
@@ -26,6 +26,8 @@
import java.nio.channels.SelectionKey;
import java.nio.channels.Selector;
import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.Queue;
import java.util.Set;
import java.util.concurrent.Executor;
@@ -41,7 +43,6 @@
import org.apache.mina.common.support.IoServiceListenerSupport;
import org.apache.mina.transport.socket.nio.DatagramSessionConfig;
import org.apache.mina.util.NamePreservingRunnable;
-import org.apache.mina.util.Queue;
/**
* {@link IoAcceptor} for datagram transport (UDP/IP).
@@ -63,9 +64,9 @@
private final int id = nextId ++ ;
private Selector selector;
private DatagramChannel channel;
- private final Queue registerQueue = new Queue();
- private final Queue cancelQueue = new Queue();
- private final Queue flushingSessions = new Queue();
+ private final Queue<RegistrationRequest> registerQueue = new LinkedList<RegistrationRequest>();
+ private final Queue<CancellationRequest> cancelQueue = new LinkedList<CancellationRequest>();
+ private final Queue<DatagramSessionImpl> flushingSessions = new LinkedList<DatagramSessionImpl>();
private Worker worker;
/**
@@ -77,7 +78,7 @@
this.executor = executor;
}
- protected Class getAddressType()
+ protected Class<? extends SocketAddress> getAddressType()
{
return InetSocketAddress.class;
}
@@ -89,7 +90,7 @@
{
synchronized( registerQueue )
{
- registerQueue.push( request );
+ registerQueue.offer( request );
}
startupWorker();
}
@@ -139,7 +140,7 @@
synchronized( cancelQueue )
{
- cancelQueue.push( request );
+ cancelQueue.offer( request );
}
}
selector.wakeup();
@@ -288,7 +289,7 @@
{
synchronized( flushingSessions )
{
- flushingSessions.push( session );
+ flushingSessions.offer( session );
}
}
@@ -429,7 +430,7 @@
synchronized( flushingSessions )
{
- session = ( DatagramSessionImpl ) flushingSessions.pop();
+ session = flushingSessions.poll();
}
if( session == null )
@@ -457,7 +458,7 @@
{
synchronized( writeRequestQueue )
{
- req = ( WriteRequest ) writeRequestQueue.first();
+ req = ( WriteRequest ) writeRequestQueue.peek();
}
if( req == null )
@@ -469,7 +470,7 @@
// pop and fire event
synchronized( writeRequestQueue )
{
- writeRequestQueue.pop();
+ writeRequestQueue.poll();
}
session.increaseWrittenMessages();
@@ -510,7 +511,7 @@
// pop and fire event
synchronized( writeRequestQueue )
{
- writeRequestQueue.pop();
+ writeRequestQueue.poll();
}
session.increaseWrittenBytes( writtenBytes );
@@ -531,7 +532,7 @@
RegistrationRequest req;
synchronized( registerQueue )
{
- req = ( RegistrationRequest ) registerQueue.pop();
+ req = registerQueue.poll();
}
if( req == null )
@@ -597,7 +598,7 @@
CancellationRequest request;
synchronized( cancelQueue )
{
- request = ( CancellationRequest ) cancelQueue.pop();
+ request = cancelQueue.poll();
}
if( request == null )
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramConnectorDelegate.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramConnectorDelegate.java?view=diff&rev=477070&r1=477069&r2=477070
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramConnectorDelegate.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramConnectorDelegate.java Sun Nov 19 22:34:55 2006
@@ -26,6 +26,8 @@
import java.nio.channels.SelectionKey;
import java.nio.channels.Selector;
import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.Queue;
import java.util.Set;
import java.util.concurrent.Executor;
@@ -43,7 +45,6 @@
import org.apache.mina.common.support.DefaultConnectFuture;
import org.apache.mina.transport.socket.nio.DatagramSessionConfig;
import org.apache.mina.util.NamePreservingRunnable;
-import org.apache.mina.util.Queue;
/**
* {@link IoConnector} for datagram transport (UDP/IP).
@@ -64,10 +65,10 @@
private final Executor executor;
private final int id = nextId ++ ;
private Selector selector;
- private final Queue registerQueue = new Queue();
- private final Queue cancelQueue = new Queue();
- private final Queue flushingSessions = new Queue();
- private final Queue trafficControllingSessions = new Queue();
+ private final Queue<RegistrationRequest> registerQueue = new LinkedList<RegistrationRequest>();
+ private final Queue<DatagramSessionImpl> cancelQueue = new LinkedList<DatagramSessionImpl>();
+ private final Queue<DatagramSessionImpl> flushingSessions = new LinkedList<DatagramSessionImpl>();
+ private final Queue<DatagramSessionImpl> trafficControllingSessions = new LinkedList<DatagramSessionImpl>();
private Worker worker;
/**
@@ -79,7 +80,7 @@
this.executor = executor;
}
- protected Class getAddressType()
+ protected Class<? extends SocketAddress> getAddressType()
{
return InetSocketAddress.class;
}
@@ -155,7 +156,7 @@
synchronized( registerQueue )
{
- registerQueue.push( request );
+ registerQueue.offer( request );
}
}
@@ -213,7 +214,7 @@
synchronized( cancelQueue )
{
- cancelQueue.push( session );
+ cancelQueue.offer( session );
}
}
@@ -234,7 +235,7 @@
{
synchronized( flushingSessions )
{
- flushingSessions.push( session );
+ flushingSessions.offer( session );
}
}
@@ -253,7 +254,7 @@
{
synchronized( trafficControllingSessions )
{
- trafficControllingSessions.push( session );
+ trafficControllingSessions.offer( session );
}
}
@@ -268,7 +269,7 @@
synchronized( trafficControllingSessions )
{
- session = ( DatagramSessionImpl ) trafficControllingSessions.pop();
+ session = trafficControllingSessions.poll();
}
if( session == null )
@@ -464,7 +465,7 @@
synchronized( flushingSessions )
{
- session = ( DatagramSessionImpl ) flushingSessions.pop();
+ session = flushingSessions.poll();
}
if( session == null )
@@ -492,7 +493,7 @@
{
synchronized( writeRequestQueue )
{
- req = ( WriteRequest ) writeRequestQueue.first();
+ req = ( WriteRequest ) writeRequestQueue.peek();
}
if( req == null )
@@ -504,7 +505,7 @@
// pop and fire event
synchronized( writeRequestQueue )
{
- writeRequestQueue.pop();
+ writeRequestQueue.poll();
}
session.increaseWrittenMessages();
@@ -539,7 +540,7 @@
// pop and fire event
synchronized( writeRequestQueue )
{
- writeRequestQueue.pop();
+ writeRequestQueue.poll();
}
session.increaseWrittenBytes( writtenBytes );
@@ -560,7 +561,7 @@
RegistrationRequest req;
synchronized( registerQueue )
{
- req = ( RegistrationRequest ) registerQueue.pop();
+ req = registerQueue.poll();
}
if( req == null )
@@ -632,7 +633,7 @@
DatagramSessionImpl session;
synchronized( cancelQueue )
{
- session = ( DatagramSessionImpl ) cancelQueue.pop();
+ session = cancelQueue.poll();
}
if( session == null )
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramFilterChain.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramFilterChain.java?view=diff&rev=477070&r1=477069&r2=477070
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramFilterChain.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramFilterChain.java Sun Nov 19 22:34:55 2006
@@ -19,12 +19,13 @@
*/
package org.apache.mina.transport.socket.nio.support;
+import java.util.Queue;
+
import org.apache.mina.common.ByteBuffer;
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.IoFilter.WriteRequest;
import org.apache.mina.common.support.AbstractIoFilterChain;
-import org.apache.mina.util.Queue;
/**
* An {@link IoFilterChain} for datagram transport (UDP/IP).
@@ -41,14 +42,14 @@
protected void doWrite( IoSession session, WriteRequest writeRequest )
{
DatagramSessionImpl s = ( DatagramSessionImpl ) session;
- Queue writeRequestQueue = s.getWriteRequestQueue();
+ Queue<WriteRequest> writeRequestQueue = s.getWriteRequestQueue();
// SocketIoProcessor.doFlush() will reset it after write is finished
// because the buffer will be passed with messageSent event.
( ( ByteBuffer ) writeRequest.getMessage() ).mark();
synchronized( writeRequestQueue )
{
- writeRequestQueue.push( writeRequest );
+ writeRequestQueue.offer( writeRequest );
if( writeRequestQueue.size() == 1 && session.getTrafficMask().isWritable() )
{
// Notify DatagramService only when writeRequestQueue was empty.
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramSessionImpl.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramSessionImpl.java?view=diff&rev=477070&r1=477069&r2=477070
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramSessionImpl.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramSessionImpl.java Sun Nov 19 22:34:55 2006
@@ -23,8 +23,11 @@
import java.net.SocketException;
import java.nio.channels.DatagramChannel;
import java.nio.channels.SelectionKey;
+import java.util.LinkedList;
+import java.util.Queue;
import org.apache.mina.common.BroadcastIoSession;
+import org.apache.mina.common.ByteBuffer;
import org.apache.mina.common.IoAcceptor;
import org.apache.mina.common.IoConnector;
import org.apache.mina.common.IoFilterChain;
@@ -38,7 +41,6 @@
import org.apache.mina.common.IoFilter.WriteRequest;
import org.apache.mina.common.support.BaseIoSession;
import org.apache.mina.transport.socket.nio.DatagramSessionConfig;
-import org.apache.mina.util.Queue;
/**
* An {@link IoSession} for datagram transport (UDP/IP).
@@ -53,7 +55,7 @@
private final DatagramService managerDelegate;
private final DatagramFilterChain filterChain = new DatagramFilterChain( this );
private final DatagramChannel ch;
- private final Queue writeRequestQueue = new Queue();
+ private final Queue<WriteRequest> writeRequestQueue = new LinkedList<WriteRequest>();
private final IoHandler handler;
private final SocketAddress localAddress;
private final SocketAddress remoteAddress;
@@ -164,7 +166,7 @@
filterChain.fireFilterClose( this );
}
- Queue getWriteRequestQueue()
+ Queue<WriteRequest> getWriteRequestQueue()
{
return writeRequestQueue;
}
@@ -194,10 +196,19 @@
public int getScheduledWriteBytes()
{
+ int size = 0;
synchronized( writeRequestQueue )
{
- return writeRequestQueue.byteSize();
+ for( Object o: writeRequestQueue )
+ {
+ if( o instanceof ByteBuffer )
+ {
+ size += ( ( ByteBuffer ) o ).remaining();
+ }
+ }
}
+
+ return size;
}
public TransportType getTransportType()
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeAcceptor.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeAcceptor.java?view=diff&rev=477070&r1=477069&r2=477070
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeAcceptor.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeAcceptor.java Sun Nov 19 22:34:55 2006
@@ -40,7 +40,7 @@
*/
public class VmPipeAcceptor extends BaseIoAcceptor
{
- static final Map boundHandlers = new HashMap();
+ static final Map<VmPipeAddress, VmPipe> boundHandlers = new HashMap<VmPipeAddress, VmPipe>();
private static final IoSessionConfig CONFIG = new BaseIoSessionConfig() {};
@@ -51,7 +51,7 @@
{
}
- protected Class getAddressType()
+ protected Class<? extends SocketAddress> getAddressType()
{
return VmPipeAddress.class;
}
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java?view=diff&rev=477070&r1=477069&r2=477070
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java Sun Nov 19 22:34:55 2006
@@ -54,14 +54,14 @@
{
}
- protected Class getAddressType()
+ protected Class<? extends SocketAddress> getAddressType()
{
return VmPipeAddress.class;
}
protected ConnectFuture doConnect( SocketAddress remoteAddress, SocketAddress localAddress )
{
- VmPipe entry = ( VmPipe ) VmPipeAcceptor.boundHandlers.get( remoteAddress );
+ VmPipe entry = VmPipeAcceptor.boundHandlers.get( remoteAddress );
if( entry == null )
{
return DefaultConnectFuture.newFailedFuture(
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeFilterChain.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeFilterChain.java?view=diff&rev=477070&r1=477069&r2=477070
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeFilterChain.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeFilterChain.java Sun Nov 19 22:34:55 2006
@@ -44,7 +44,7 @@
{
synchronized( s.pendingDataQueue )
{
- s.pendingDataQueue.push( message );
+ s.pendingDataQueue.offer( message );
}
}
else
@@ -74,7 +74,7 @@
{
synchronized( s.pendingDataQueue )
{
- s.pendingDataQueue.push( writeRequest );
+ s.pendingDataQueue.offer( writeRequest );
}
}
else
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeIdleStatusChecker.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeIdleStatusChecker.java?view=diff&rev=477070&r1=477069&r2=477070
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeIdleStatusChecker.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeIdleStatusChecker.java Sun Nov 19 22:34:55 2006
@@ -19,11 +19,11 @@
*/
package org.apache.mina.transport.vmpipe.support;
-import java.util.IdentityHashMap;
import java.util.Iterator;
-import java.util.Map;
+import java.util.Set;
import org.apache.mina.common.IdleStatus;
+import org.apache.mina.util.IdentityHashSet;
/**
* Dectects idle sessions and fires <tt>sessionIdle</tt> events to them.
@@ -40,7 +40,7 @@
return INSTANCE;
}
- private final Map sessions = new IdentityHashMap(); // will use as a set
+ private final Set<VmPipeSessionImpl> sessions = new IdentityHashSet<VmPipeSessionImpl>();
private final Worker worker = new Worker();
@@ -53,7 +53,7 @@
{
synchronized( sessions )
{
- sessions.put( session, session );
+ sessions.add( session );
}
}
@@ -81,10 +81,10 @@
synchronized( sessions )
{
- Iterator it = sessions.keySet().iterator();
+ Iterator<VmPipeSessionImpl> it = sessions.iterator();
while( it.hasNext() )
{
- VmPipeSessionImpl session = ( VmPipeSessionImpl ) it.next();
+ VmPipeSessionImpl session = it.next();
if( !session.isConnected() )
{
it.remove();
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeSessionImpl.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeSessionImpl.java?view=diff&rev=477070&r1=477069&r2=477070
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeSessionImpl.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeSessionImpl.java Sun Nov 19 22:34:55 2006
@@ -20,6 +20,8 @@
package org.apache.mina.transport.vmpipe.support;
import java.net.SocketAddress;
+import java.util.LinkedList;
+import java.util.Queue;
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoHandler;
@@ -31,7 +33,6 @@
import org.apache.mina.common.support.BaseIoSession;
import org.apache.mina.common.support.BaseIoSessionConfig;
import org.apache.mina.common.support.IoServiceListenerSupport;
-import org.apache.mina.util.Queue;
/**
* A {@link IoSession} for in-VM transport (VM_PIPE).
@@ -52,7 +53,7 @@
private final VmPipeFilterChain filterChain;
private final VmPipeSessionImpl remoteSession;
final Object lock;
- final Queue pendingDataQueue;
+ final Queue<Object> pendingDataQueue;
/**
* Constructor for client-side session.
@@ -69,7 +70,7 @@
this.remoteAddress = this.serviceAddress = remoteEntry.getAddress();
this.handler = handler;
this.filterChain = new VmPipeFilterChain( this );
- this.pendingDataQueue = new Queue();
+ this.pendingDataQueue = new LinkedList<Object>();
remoteSession = new VmPipeSessionImpl( this, remoteEntry );
}
@@ -87,7 +88,7 @@
this.handler = entry.getHandler();
this.filterChain = new VmPipeFilterChain( this );
this.remoteSession = remoteSession;
- this.pendingDataQueue = new Queue();
+ this.pendingDataQueue = new LinkedList<Object>();
}
public IoService getService()
Modified: mina/trunk/core/src/main/java/org/apache/mina/util/AvailablePortFinder.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/util/AvailablePortFinder.java?view=diff&rev=477070&r1=477069&r2=477070
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/util/AvailablePortFinder.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/util/AvailablePortFinder.java Sun Nov 19 22:34:55 2006
@@ -157,7 +157,7 @@
* {@link #MIN_PORT_NUMBER} and {@link #MAX_PORT_NUMBER} or
* <code>fromPort</code> if greater than <code>toPort</code>.
*/
- public static Set getAvailablePorts(int fromPort, int toPort)
+ public static Set<Integer> getAvailablePorts(int fromPort, int toPort)
{
if (
(fromPort < MIN_PORT_NUMBER) || (toPort > MAX_PORT_NUMBER)
@@ -167,7 +167,7 @@
+ fromPort + " ~ " + toPort);
}
- Set result = new TreeSet();
+ Set<Integer> result = new TreeSet<Integer>();
for (int i = fromPort; i <= toPort; i++)
{
Modified: mina/trunk/core/src/main/java/org/apache/mina/util/CharsetUtil.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/util/CharsetUtil.java?view=diff&rev=477070&r1=477069&r2=477070
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/util/CharsetUtil.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/util/CharsetUtil.java Sun Nov 19 22:34:55 2006
@@ -38,8 +38,8 @@
try
{
Class charsetClass = Class.forName( "java.nio.charset.Charset" );
- Object charSet = charsetClass.getMethod( "defaultCharset", null ).invoke( null, null );
- return ( String ) charsetClass.getMethod( "name", null ).invoke( charSet, null );
+ Object charSet = charsetClass.getMethod( "defaultCharset", ( Class[] ) null ).invoke( null, ( Object[] ) null );
+ return ( String ) charsetClass.getMethod( "name", ( Class[] ) null ).invoke( charSet, ( Object[] ) null );
}
catch ( Exception e )
{
Modified: mina/trunk/core/src/main/java/org/apache/mina/util/ExpiringMap.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/util/ExpiringMap.java?view=diff&rev=477070&r1=477069&r2=477070
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/util/ExpiringMap.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/util/ExpiringMap.java Sun Nov 19 22:34:55 2006
@@ -41,9 +41,9 @@
private static volatile int expirerCount = 1;
- private final ConcurrentHashMap delegate;
+ private final ConcurrentHashMap<Object, ExpiringObject> delegate;
- private final CopyOnWriteArrayList expirationListeners;
+ private final CopyOnWriteArrayList<ExpirationListener> expirationListeners;
private final Expirer expirer;
@@ -59,11 +59,11 @@
public ExpiringMap( int timeToLive, int expirationInterval )
{
- this( new ConcurrentHashMap(), new CopyOnWriteArrayList(), timeToLive, expirationInterval );
+ this( new ConcurrentHashMap<Object, ExpiringObject>(), new CopyOnWriteArrayList<ExpirationListener>(), timeToLive, expirationInterval );
}
private ExpiringMap(
- ConcurrentHashMap delegate, CopyOnWriteArrayList expirationListeners,
+ ConcurrentHashMap<Object, ExpiringObject> delegate, CopyOnWriteArrayList<ExpirationListener> expirationListeners,
int timeToLive, int expirationInterval )
{
this.delegate = delegate;
@@ -152,7 +152,7 @@
if( value instanceof ExpiringObject )
{
- delegate.put( key, value );
+ delegate.put( key, ( ExpiringObject ) value );
}
}
}
Modified: mina/trunk/core/src/main/java/org/apache/mina/util/IdentityHashSet.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/util/IdentityHashSet.java?view=diff&rev=477070&r1=477069&r2=477070
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/util/IdentityHashSet.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/util/IdentityHashSet.java Sun Nov 19 22:34:55 2006
@@ -32,15 +32,15 @@
* @author The Apache Directory Project (mina-dev@directory.apache.org)
* @version $Rev$, $Date$
*/
-public class IdentityHashSet extends AbstractSet
+public class IdentityHashSet<E> extends AbstractSet<E>
{
- private final Map delegate = new IdentityHashMap();
+ private final Map<E, Boolean> delegate = new IdentityHashMap<E, Boolean>();
public IdentityHashSet()
{
}
- public IdentityHashSet( Collection c )
+ public IdentityHashSet( Collection<E> c )
{
addAll( c );
}
@@ -55,19 +55,19 @@
return delegate.containsKey( o );
}
- public Iterator iterator()
+ public Iterator<E> iterator()
{
return delegate.keySet().iterator();
}
- public boolean add( Object arg0 )
+ public boolean add( E arg0 )
{
return delegate.put( arg0, Boolean.TRUE ) == null;
}
- public boolean remove( Object o )
+ public boolean remove( Object arg0 )
{
- return delegate.remove( o ) != null;
+ return delegate.remove( arg0 ) != null;
}
public void clear()
Modified: mina/trunk/core/src/test/java/org/apache/mina/common/ByteBufferTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/common/ByteBufferTest.java?view=diff&rev=477070&r1=477069&r2=477070
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/common/ByteBufferTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/common/ByteBufferTest.java Sun Nov 19 22:34:55 2006
@@ -176,6 +176,7 @@
public void testPooledProperty() throws Exception
{
+ ByteBuffer.setAllocator( new PooledByteBufferAllocator() );
ByteBuffer buf = ByteBuffer.allocate( 16 );
java.nio.ByteBuffer nioBuf = buf.buf();
buf.release();
@@ -536,7 +537,7 @@
{
ByteBuffer buf = ByteBuffer.allocate( 16 );
buf.setAutoExpand( true );
- List o = new ArrayList();
+ List<Object> o = new ArrayList<Object>();
o.add( new Date() );
// Test writing an object.
@@ -610,6 +611,7 @@
public void testPoolExpiration() throws Exception
{
+ ByteBuffer.setAllocator( new PooledByteBufferAllocator() );
PooledByteBufferAllocator allocator =
( PooledByteBufferAllocator ) ByteBuffer.getAllocator();
@@ -637,6 +639,7 @@
public void testAllocatorDisposal() throws Exception
{
+ ByteBuffer.setAllocator( new PooledByteBufferAllocator() );
PooledByteBufferAllocator allocator =
( PooledByteBufferAllocator ) ByteBuffer.getAllocator();
@@ -671,6 +674,7 @@
public void testDuplicate() throws Exception
{
+ ByteBuffer.setAllocator( new PooledByteBufferAllocator() );
java.nio.ByteBuffer nioBuf;
ByteBuffer original;
ByteBuffer duplicate;