Re: cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/util FastQueue.java IQueue.java LinkObject.java SingleRemoveSynchronizedAddLock.java

2005-03-15 Thread Remy Maucherat 
[EMAIL PROTECTED] wrote:
pero2005/03/14 13:24:30
  Modified:modules/cluster/src/share/org/apache/catalina/cluster/tcp
AsyncSocketSender.java Constants.java
DataSender.java IDataSender.java
IDataSenderFactory.java LocalStrings.properties
mbeans-descriptors.xml

  +else if ( FAST_ASYNC_QUEUE_MODE.equals(mode) )
  +return new 
FastAsyncSocketSender(InetAddress.getByName(mbr.getHost()),mbr.getPort());
Small mistake: you apparently forgot to add the FastAsyncSocketSender class.
Rémy
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/util FastQueue.java IQueue.java LinkObject.java SingleRemoveSynchronizedAddLock.java

2005-03-14 Thread pero 
pero2005/03/14 13:24:30

  Modified:modules/cluster/src/share/org/apache/catalina/cluster/tcp
AsyncSocketSender.java Constants.java
DataSender.java IDataSender.java
IDataSenderFactory.java LocalStrings.properties
mbeans-descriptors.xml
  Added:   modules/cluster/src/share/org/apache/catalina/cluster/util
FastQueue.java IQueue.java LinkObject.java
SingleRemoveSynchronizedAddLock.java
  Log:
  Add support to new fast async mode
  submitted by Rainer Jung
  
  Revision  ChangesPath
  1.11  +3 -4  
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/AsyncSocketSender.java
  
  Index: AsyncSocketSender.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/AsyncSocketSender.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- AsyncSocketSender.java15 Feb 2005 09:31:45 -  1.10
  +++ AsyncSocketSender.java14 Mar 2005 21:24:30 -  1.11
  @@ -36,7 +36,7 @@
* 
* @author Filip Hanik
* @author Peter Rossbach
  - * @version 1.2
  + * @version $Revision$ $Date$
*/
   public class AsyncSocketSender extends DataSender {
   
  @@ -89,7 +89,6 @@
   public AsyncSocketSender(InetAddress host, int port) {
   super(host, port);
   checkThread();
  -long a = Long.MAX_VALUE;
   }
   
   // - 
Properties
  @@ -169,7 +168,7 @@
   queuedNrOfBytes += data.length;
   if (log.isTraceEnabled())
   log.trace(sm.getString("AsyncSocketSender.queue.message",
  -getAddress(), new Integer(getPort()), messageid, new 
Long(
  +getAddress().getHostAddress(), new Integer(getPort()), 
messageid, new Long(
   data.length)));
   }
   
  @@ -188,7 +187,7 @@
*/
   public String toString() {
   StringBuffer buf = new StringBuffer("AsyncSocketSender[");
  -buf.append(getAddress()).append(":").append(getPort()).append("]");
  +
buf.append(getAddress().getHostAddress()).append(":").append(getPort()).append("]");
   return buf.toString();
   }
   
  
  
  
  1.2   +1 -0  
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/Constants.java
  
  Index: Constants.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/Constants.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Constants.java15 Feb 2005 09:26:19 -  1.1
  +++ Constants.java14 Mar 2005 21:24:30 -  1.2
  @@ -22,6 +22,7 @@
* package.
*
* @author Peter Rossbach
  + * @version $Revision$ $Date$
*/
   
   public class Constants {
  
  
  
  1.3   +7 -7  
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/DataSender.java
  
  Index: DataSender.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/DataSender.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DataSender.java   26 Feb 2005 09:12:26 -  1.2
  +++ DataSender.java   14 Mar 2005 21:24:30 -  1.3
  @@ -29,7 +29,7 @@
* 
* @author Peter Rossbach
* @author Filip Hanik
  - * @version 1.2
  + * @version $Revision$ $Date$
*/
   public class DataSender implements IDataSender {
   
  @@ -268,7 +268,7 @@
   public void connect() throws java.io.IOException {
   connectCounter++;
   if (log.isDebugEnabled())
  -log.debug(sm.getString("IDataSender.connect", address,
  +log.debug(sm.getString("IDataSender.connect", 
address.getHostAddress(),
   new Integer(port)));
   openSocket();
   }
  @@ -283,7 +283,7 @@
   public void disconnect() {
   disconnectCounter++;
   if (log.isDebugEnabled())
  -log.debug(sm.getString("IDataSender.disconnect", address,
  +log.debug(sm.getString("IDataSender.disconnect", 
address.getHostAddress(),
   new Integer(port)));
   closeSocket();
   }
  @@ -350,7 +350,7 @@
   protected void openSocket() throws IOException, SocketException {
   socketOpenCounter++;
   if (log.isDebugEnabled())
  -log.debug(sm.getString("IDataSender.openSocket", address, new 
Integer(
  +log.debug(sm.getString("IDataSender.openSocket", 
address.getHostAddress()