From a18be69fb902726de21020eb9a1f26542a92522b Mon Sep 17 00:00:00 2001 From: fhanik Date: Fri, 15 Dec 2006 00:30:53 +0000 Subject: [PATCH] Name change in preparation of pluggable Executors and thread fairness git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@487409 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/tribes/transport/bio/BioReceiver.java | 6 +++--- .../bio/{BioReplicationThread.java => BioReplicationTask.java} | 6 +++--- java/org/apache/catalina/tribes/transport/nio/NioReceiver.java | 4 ++-- .../nio/{NioReplicationThread.java => NioReplicationTask.java} | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) rename java/org/apache/catalina/tribes/transport/bio/{BioReplicationThread.java => BioReplicationTask.java} (97%) rename java/org/apache/catalina/tribes/transport/nio/{NioReplicationThread.java => NioReplicationTask.java} (98%) diff --git a/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java b/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java index 561d9f414..7bdec3a1e 100644 --- a/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java +++ b/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java @@ -77,8 +77,8 @@ public class BioReceiver extends ReceiverBase implements Runnable, ChannelReceiv return getReplicationThread(); } - protected BioReplicationThread getReplicationThread() { - BioReplicationThread result = new BioReplicationThread(this); + protected BioReplicationTask getReplicationThread() { + BioReplicationTask result = new BioReplicationTask(this); result.setOptions(getWorkerThreadOptions()); result.setUseBufferPool(this.getUseBufferPool()); return result; @@ -129,7 +129,7 @@ public class BioReceiver extends ReceiverBase implements Runnable, ChannelReceiv if ( log.isWarnEnabled() ) log.warn("All BIO server replication threads are busy, unable to handle more requests until a thread is freed up."); } - BioReplicationThread thread = (BioReplicationThread)getPool().getWorker(); + BioReplicationTask thread = (BioReplicationTask)getPool().getWorker(); if ( thread == null ) continue; //should never happen try { socket = serverSocket.accept(); diff --git a/java/org/apache/catalina/tribes/transport/bio/BioReplicationThread.java b/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java similarity index 97% rename from java/org/apache/catalina/tribes/transport/bio/BioReplicationThread.java rename to java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java index 38cf96784..9e4583031 100644 --- a/java/org/apache/catalina/tribes/transport/bio/BioReplicationThread.java +++ b/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java @@ -44,15 +44,15 @@ import org.apache.catalina.tribes.io.BufferPool; * * @version $Revision$, $Date$ */ -public class BioReplicationThread extends AbstractRxTask { +public class BioReplicationTask extends AbstractRxTask { - protected static org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory.getLog( BioReplicationThread.class ); + protected static org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory.getLog( BioReplicationTask.class ); protected Socket socket; protected ObjectReader reader; - public BioReplicationThread (ListenCallback callback) { + public BioReplicationTask (ListenCallback callback) { super(callback); } diff --git a/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java b/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java index 0c547764b..1c0b99803 100644 --- a/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java +++ b/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java @@ -110,7 +110,7 @@ public class NioReceiver extends ReceiverBase implements Runnable, ChannelReceiv } public AbstractRxTask getWorkerThread() { - NioReplicationThread thread = new NioReplicationThread(this,this); + NioReplicationTask thread = new NioReplicationTask(this,this); thread.setUseBufferPool(this.getUseBufferPool()); thread.setRxBufSize(getRxBufSize()); thread.setOptions(getWorkerThreadOptions()); @@ -365,7 +365,7 @@ public class NioReceiver extends ReceiverBase implements Runnable, ChannelReceiv * will then de-register the channel on the next select call. */ protected void readDataFromSocket(SelectionKey key) throws Exception { - NioReplicationThread worker = (NioReplicationThread) getPool().getWorker(); + NioReplicationTask worker = (NioReplicationTask) getPool().getWorker(); if (worker == null) { // No threads available, do nothing, the selection // loop will keep calling this method until a diff --git a/java/org/apache/catalina/tribes/transport/nio/NioReplicationThread.java b/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java similarity index 98% rename from java/org/apache/catalina/tribes/transport/nio/NioReplicationThread.java rename to java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java index 6f3c75f00..529b369cb 100644 --- a/java/org/apache/catalina/tribes/transport/nio/NioReplicationThread.java +++ b/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java @@ -47,15 +47,15 @@ import org.apache.catalina.tribes.util.Logs; * * @version $Revision$, $Date$ */ -public class NioReplicationThread extends AbstractRxTask { +public class NioReplicationTask extends AbstractRxTask { - private static org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory.getLog( NioReplicationThread.class ); + private static org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory.getLog( NioReplicationTask.class ); private ByteBuffer buffer = null; private SelectionKey key; private int rxBufSize; private NioReceiver receiver; - public NioReplicationThread (ListenCallback callback, NioReceiver receiver) + public NioReplicationTask (ListenCallback callback, NioReceiver receiver) { super(callback); this.receiver = receiver; -- 2.11.0