From db225894f1f1600ef0f67a33ba1336ae7a253005 Mon Sep 17 00:00:00 2001 From: markt Date: Wed, 24 Dec 2008 15:37:17 +0000 Subject: [PATCH] Generics for o.a.c.tribes.transport.nio Fix some other Eclispe warnings (unused code etc) git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@729322 13f79535-47bb-0310-9956-ffa450edef68 --- .../catalina/tribes/transport/nio/NioReceiver.java | 25 ++++++++-------- .../tribes/transport/nio/ParallelNioSender.java | 34 +++++++++++----------- .../tribes/transport/nio/PooledParallelSender.java | 3 +- 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java b/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java index a0837c010..7a447610f 100644 --- a/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java +++ b/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java @@ -18,7 +18,6 @@ package org.apache.catalina.tribes.transport.nio; import java.io.IOException; -import java.net.InetSocketAddress; import java.net.ServerSocket; import java.nio.channels.DatagramChannel; import java.nio.channels.SelectableChannel; @@ -63,7 +62,7 @@ public class NioReceiver extends ReceiverBase implements Runnable, ChannelReceiv private ServerSocketChannel serverChannel = null; private DatagramChannel datagramChannel = null; - protected LinkedList events = new LinkedList(); + protected LinkedList events = new LinkedList(); // private Object interestOpsMutex = new Object(); public NioReceiver() { @@ -133,7 +132,7 @@ public class NioReceiver extends ReceiverBase implements Runnable, ChannelReceiv selector = Selector.open(); // set the port the server channel will listen to //serverSocket.bind(new InetSocketAddress(getBind(), getTcpListenPort())); - bind(serverSocket,getTcpListenPort(),getAutoBind()); + bind(serverSocket,getPort(),getAutoBind()); // set non-blocking mode for the listening socket serverChannel.configureBlocking(false); // register the ServerSocketChannel with the Selector @@ -165,7 +164,7 @@ public class NioReceiver extends ReceiverBase implements Runnable, ChannelReceiv if ( events.size() == 0 ) return; synchronized (events) { Runnable r = null; - while ( (events.size() > 0) && (r = (Runnable)events.removeFirst()) != null ) { + while ( (events.size() > 0) && (r = events.removeFirst()) != null ) { try { if ( log.isTraceEnabled() ) log.trace("Processing event in selector:"+r); r.run(); @@ -198,10 +197,10 @@ public class NioReceiver extends ReceiverBase implements Runnable, ChannelReceiv if ( (now-lastCheck) < getSelectorTimeout() ) return; //timeout Selector tmpsel = selector; - Set keys = (isListening()&&tmpsel!=null)?tmpsel.keys():null; + Set keys = (isListening()&&tmpsel!=null)?tmpsel.keys():null; if ( keys == null ) return; - for (Iterator iter = keys.iterator(); iter.hasNext(); ) { - SelectionKey key = (SelectionKey) iter.next(); + for (Iterator iter = keys.iterator(); iter.hasNext(); ) { + SelectionKey key = iter.next(); try { // if (key.interestOps() == SelectionKey.OP_READ) { // //only timeout sockets that we are waiting for a read from @@ -217,7 +216,7 @@ public class NioReceiver extends ReceiverBase implements Runnable, ChannelReceiv ObjectReader ka = (ObjectReader) key.attachment(); if ( ka != null ) { long delta = now - ka.getLastAccess(); - if (delta > (long) getTimeout() && (!ka.isAccessed())) { + if (delta > getTimeout() && (!ka.isAccessed())) { if (log.isWarnEnabled()) log.warn("Channel key is registered, but has had no interest ops for the last "+getTimeout()+" ms. (cancelled:"+ka.isCancelled()+"):"+key+" last access:"+new java.sql.Timestamp(ka.getLastAccess())+" Possible cause: all threads used, perform thread dump"); ka.setLastAccess(now); @@ -264,7 +263,7 @@ public class NioReceiver extends ReceiverBase implements Runnable, ChannelReceiv try { events(); socketTimeouts(); - int n = selector.select(getTcpSelectorTimeout()); + int n = selector.select(getSelectorTimeout()); if (n == 0) { //there is a good chance that we got here //because the TcpReplicationThread called @@ -279,10 +278,10 @@ public class NioReceiver extends ReceiverBase implements Runnable, ChannelReceiv continue; // nothing to do } // get an iterator over the set of selected keys - Iterator it = (selector!=null)?selector.selectedKeys().iterator():null; + Iterator it = (selector!=null)?selector.selectedKeys().iterator():null; // look at each key in the selected set while (selector!=null && it.hasNext()) { - SelectionKey key = (SelectionKey) it.next(); + SelectionKey key = it.next(); // Is a new connection coming in? if (key.isAcceptable()) { ServerSocketChannel server = (ServerSocketChannel) key.channel(); @@ -364,10 +363,10 @@ public class NioReceiver extends ReceiverBase implements Runnable, ChannelReceiv this.selector = null; if (selector==null) return; try { - Iterator it = selector.keys().iterator(); + Iterator it = selector.keys().iterator(); // look at each key in the selected set while (it.hasNext()) { - SelectionKey key = (SelectionKey)it.next(); + SelectionKey key = it.next(); key.channel().close(); key.attach(null); key.cancel(); diff --git a/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java b/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java index 7743ef3ab..b781c6d5e 100644 --- a/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java +++ b/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java @@ -23,6 +23,7 @@ import java.nio.channels.Selector; import java.util.HashMap; import java.util.Iterator; import java.util.Map; +import java.util.Map.Entry; import org.apache.catalina.tribes.ChannelException; import org.apache.catalina.tribes.ChannelMessage; @@ -52,7 +53,8 @@ public class ParallelNioSender extends AbstractSender implements MultiPointSende protected static org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory.getLog(ParallelNioSender.class); protected long selectTimeout = 5000; //default 5 seconds, same as send timeout protected Selector selector; - protected HashMap nioSenders = new HashMap(); + protected HashMap nioSenders = + new HashMap(); public ParallelNioSender() throws IOException { selector = Selector.open(); @@ -120,9 +122,9 @@ public class ParallelNioSender extends AbstractSender implements MultiPointSende return 0; } - Iterator it = selector.selectedKeys().iterator(); + Iterator it = selector.selectedKeys().iterator(); while (it.hasNext()) { - SelectionKey sk = (SelectionKey) it.next(); + SelectionKey sk = it.next(); it.remove(); int readyOps = sk.readyOps(); sk.interestOps(sk.interestOps() & ~readyOps); @@ -211,21 +213,19 @@ public class ParallelNioSender extends AbstractSender implements MultiPointSende ChannelException cx = null; NioSender[] result = new NioSender[destination.length]; for ( int i=0; i> i = nioSenders.entrySet().iterator(); i.hasNext(); ) { + Map.Entry entry = i.next(); + NioSender sender = entry.getValue(); if ( sender.keepalive() ) { //nioSenders.remove(entry.getKey()); i.remove(); diff --git a/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java b/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java index 1ec9e3611..2e9c181dd 100644 --- a/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java +++ b/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java @@ -21,6 +21,7 @@ import java.io.IOException; import org.apache.catalina.tribes.ChannelException; import org.apache.catalina.tribes.ChannelMessage; import org.apache.catalina.tribes.Member; +import org.apache.catalina.tribes.transport.AbstractSender; import org.apache.catalina.tribes.transport.DataSender; import org.apache.catalina.tribes.transport.MultiPointSender; import org.apache.catalina.tribes.transport.PooledSender; @@ -62,7 +63,7 @@ public class PooledParallelSender extends PooledSender implements MultiPointSend public DataSender getNewDataSender() { try { ParallelNioSender sender = new ParallelNioSender(); - sender.transferProperties(this,sender); + AbstractSender.transferProperties(this,sender); return sender; } catch ( IOException x ) { throw new RuntimeException("Unable to open NIO selector.",x); -- 2.11.0