tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fha...@apache.org
Subject svn commit: r382188 - in /tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes: io/ tcp/
Date Wed, 01 Mar 2006 23:04:18 GMT
Author: fhanik
Date: Wed Mar  1 15:04:11 2006
New Revision: 382188

URL: http://svn.apache.org/viewcvs?rev=382188&view=rev
Log:
Rebuilt the ACK message, it is not a complete package according to our replication TCP protocol.
This way, we can use ACK messages with our NIO senders as well.
Added in the skeleton of the NioSender and the parallel NioSender
The NioSender will be able to be used in async mode as well as in sync mode using the ParallelNioSender



Added:
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/NioSender.java
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/ParallelNioSender.java
Modified:
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/io/XByteBuffer.java
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/Constants.java
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/DataSender.java
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/IDataSender.java
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/PooledSocketSender.java
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/TcpReplicationThread.java

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/io/XByteBuffer.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/io/XByteBuffer.java?rev=382188&r1=382187&r2=382188&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/io/XByteBuffer.java
(original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/io/XByteBuffer.java
Wed Mar  1 15:04:11 2006
@@ -321,7 +321,10 @@
      * 
      */
     public static byte[] createDataPackage(ClusterData cdata) throws java.io.IOException
{
-        byte[] data = cdata.getDataPackage();
+        return createDataPackage(cdata.getDataPackage());
+    }
+    
+    public static byte[] createDataPackage(byte[] data) {
         int length = 
             START_DATA.length + //header length
             4 + //data length indicator

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/Constants.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/Constants.java?rev=382188&r1=382187&r2=382188&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/Constants.java
(original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/Constants.java
Wed Mar  1 15:04:11 2006
@@ -17,6 +17,8 @@
 
 package org.apache.catalina.tribes.tcp;
 
+import org.apache.catalina.tribes.io.XByteBuffer;
+
 /**
  * Manifest constants for the <code>org.apache.catalina.tribes.tcp</code>
  * package.
@@ -28,5 +30,8 @@
 public class Constants {
 
     public static final String Package = "org.apache.catalina.tribes.tcp";
+    
+    public static final byte[] ACK_DATA = new byte[] {6, 2, 3};
+    public static final byte[] ACK_COMMAND = XByteBuffer.createDataPackage(ACK_DATA);
 
 }

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/DataSender.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/DataSender.java?rev=382188&r1=382187&r2=382188&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/DataSender.java
(original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/DataSender.java
Wed Mar  1 15:04:11 2006
@@ -221,6 +221,8 @@
      * We are only sending acks
      */
     protected int txBufSize = 25188;
+    
+    protected XByteBuffer ackbuf = new XByteBuffer(Constants.ACK_COMMAND.length,true);
 
 
     // ------------------------------------------------------------- Constructor
@@ -530,7 +532,7 @@
     /**
      * @return Returns the waitForAck.
      */
-    public boolean isWaitForAck() {
+    public boolean getWaitForAck() {
         return waitForAck;
     }
 
@@ -709,7 +711,7 @@
            return ;
        try {
             createSocket();
-            if (isWaitForAck()) socket.setSoTimeout((int) ackTimeout);
+            if (getWaitForAck()) socket.setSoTimeout((int) ackTimeout);
             isSocketConnected = true;
             socketOpenCounter++;
             this.keepAliveCount = 0;
@@ -888,7 +890,7 @@
         try {
             socketout.write(XByteBuffer.createDataPackage((ClusterData)data));
             socketout.flush();
-            if (isWaitForAck()) waitForAck(ackTimeout);
+            if (getWaitForAck()) waitForAck(ackTimeout);
         } finally {
             synchronized(this) {
                 isMessageTransferStarted = false ;
@@ -903,24 +905,31 @@
      * @throws java.io.IOException
      * @throws java.net.SocketTimeoutException
      */
-    protected void waitForAck(long timeout) throws java.io.IOException {
+    protected synchronized void waitForAck(long timeout) throws java.io.IOException {
         long time = 0 ;
+        
         if(doWaitAckStats) {
             time = System.currentTimeMillis();
         }
         try {
+            boolean ackReceived = false;
+            ackbuf.clear();
             int bytesRead = 0;
-            if ( log.isTraceEnabled() ) log.trace(sm.getString("IDataSender.ack.start",getAddress(),
new Integer(socket.getLocalPort())));
             int i = socket.getInputStream().read();
-            while ((i != -1) && (i != 3) && bytesRead < 10) {
-                if ( log.isTraceEnabled() )  log.trace(sm.getString("IDataSender.ack.read",getAddress(),
new Integer(socket.getLocalPort()),new Character((char) i)));
+            while ((i != -1) && (bytesRead < Constants.ACK_COMMAND.length)) {
                 bytesRead++;
+                byte d = (byte)i;
+                ackbuf.append(d);
+                if (ackbuf.doesPackageExist() ) {
+                    ackReceived = true;
+                    break;
+                }
                 i = socket.getInputStream().read();
             }
-            if (i != 3) {
+            if (!ackReceived) {
                 if (i == -1) throw new IOException(sm.getString("IDataSender.ack.eof",getAddress(),
new Integer(socket.getLocalPort())));
                 else throw new IOException(sm.getString("IDataSender.ack.wrong",getAddress(),
new Integer(socket.getLocalPort())));
-            } else if (log.isTraceEnabled()) log.trace(sm.getString("IDataSender.ack.receive",
getAddress(),new Integer(socket.getLocalPort())));
+            }
         } catch (IOException x) {
             missingAckCounter++;
             String errmsg = sm.getString("IDataSender.ack.missing", getAddress(),new Integer(socket.getLocalPort()),
new Long(this.ackTimeout));
@@ -932,6 +941,7 @@
             }
             throw x;
         } finally {
+            ackbuf.clear();
             if(doWaitAckStats) addWaitAckStats(time);
         }
     }

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/IDataSender.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/IDataSender.java?rev=382188&r1=382187&r2=382188&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/IDataSender.java
(original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/IDataSender.java
Wed Mar  1 15:04:11 2006
@@ -39,7 +39,7 @@
     public boolean getSuspect();
     public void setAckTimeout(long timeout);
     public long getAckTimeout();
-    public boolean isWaitForAck();
+    public boolean getWaitForAck();
     public void setWaitForAck(boolean isWaitForAck);
     public boolean checkKeepAlive();
     public String getDomain() ;

Added: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/NioSender.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/NioSender.java?rev=382188&view=auto
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/NioSender.java
(added)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/NioSender.java
Wed Mar  1 15:04:11 2006
@@ -0,0 +1,386 @@
+/*
+ * Copyright 1999,2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.catalina.tribes.tcp;
+
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.nio.channels.Selector;
+import java.nio.channels.SocketChannel;
+
+import org.apache.catalina.tribes.ChannelMessage;
+import java.nio.channels.SelectionKey;
+import java.nio.ByteBuffer;
+import org.apache.catalina.tribes.io.XByteBuffer;
+
+/**
+ * This class is NOT thread safe and should never be used with more than one thread at a
time
+ * 
+ * This is a state machine, handled by the process method
+ * States are:
+ * - NOT_CONNECTED -> connect() -> CONNECTED
+ * - CONNECTED -> setMessage() -> READY TO WRITE
+ * - READY_TO_WRITE -> write() -> READY TO WRITE | READY TO READ
+ * - READY_TO_READ -> read() -> READY_TO_READ | TRANSFER_COMPLETE
+ * - TRANSFER_COMPLETE -> CONNECTED
+ * 
+ * @author Filip Hanik
+ * @version 1.0
+ */
+public class NioSender  {
+
+    protected static org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(NioSender.class);
+
+    
+    protected long ackTimeout = 15000;
+    protected InetAddress address;
+    protected String domain = "";
+    protected int port;
+    protected boolean suspect = false;
+    protected boolean connected = false;
+    protected boolean waitForAck = false;
+    protected int rxBufSize = 25188;
+    protected int txBufSize = 43800;
+    protected Selector selector;
+    
+    
+    protected SocketChannel socketChannel;
+    protected ByteBuffer buf = null;
+    protected boolean direct = false;
+    protected ChannelMessage current = null;
+    protected int curPos=0;
+    protected XByteBuffer ackbuf = new XByteBuffer(128,true);
+
+    public NioSender() {
+        
+    }
+    
+    public boolean process(SelectionKey key) throws IOException {
+        int ops = key.readyOps();
+        key.interestOps(key.interestOps() & ~ops);
+        if ( key.isConnectable() ) {
+            if ( socketChannel.finishConnect() ) {
+                //we connected, register ourselves for writing
+                this.connected = true;
+                key.interestOps(key.interestOps() | SelectionKey.OP_WRITE);
+                return false;
+            }
+        } else if ( key.isWritable() ) {
+            boolean writecomplete = write(key);
+            if ( writecomplete ) {
+                //we are completed, should we read an ack?
+                if ( waitForAck ) key.interestOps(key.interestOps()|SelectionKey.OP_READ);
+                //if not, we are ready, setMessage will reregister us for write interest
+                else return true;
+            } else {
+                //we are not complete, lets write some more
+                key.interestOps(key.interestOps()|SelectionKey.OP_WRITE);
+            }
+        } else if ( key.isReadable() ) {
+            //TODO, HANDLE ACK TIMEOUT-and reconnect
+            boolean readcomplete = read(key);
+            if ( readcomplete ) return true;
+            else key.interestOps(key.interestOps()|SelectionKey.OP_READ);
+        } else {
+            //unknown state
+            log.warn("Data is in unknown state. readyOps="+ops);
+        }
+        return false;
+        
+    }
+
+    protected boolean read(SelectionKey key) throws IOException {
+        //if there is no message here, we are done
+        if ( current == null ) return true;
+        int read = socketChannel.read(buf);
+        //end of stream
+        if ( read == -1 ) return true;
+        //no data read
+        else if ( read == 0 ) return false;
+        throw new UnsupportedOperationException();
+    }
+
+    
+    protected boolean write(SelectionKey key) throws IOException {
+        if ( (!connected) || (this.socketChannel==null)) {
+            throw new IOException("NioSender is not connected, this should not occur.");
+        }
+        if ( current != null ) {
+            int remaining = buf.remaining();
+            if ( remaining > 0 ) {
+                //write the rest of the buffer
+                remaining -= socketChannel.write(buf);
+            }            
+            if ( remaining == 0 ) {
+                //weve written everything, or we are starting a new package
+                XByteBuffer msg = current.getMessage();
+                remaining = msg.getLength() - curPos;
+                buf.clear();
+                //protect against buffer overwrite
+                int length = Math.min(remaining,txBufSize);
+                buf.put(msg.getBytesDirect(),curPos,length);
+                
+                //if the entire message fits in the buffer
+                //reset the position counter
+                curPos += length;
+                if ( curPos >= msg.getLength() ) curPos = 0;
+                remaining -= socketChannel.write(buf);
+            }
+            //the write 
+            return (remaining==0 && curPos == 0);
+        }
+        //no message to send, we can consider that complete
+        return true;
+    }
+
+    /**
+     * connect - blocking in this operation
+     *
+     * @throws IOException
+     * @todo Implement this org.apache.catalina.tribes.tcp.IDataSender method
+     */
+    public synchronized void connect() throws IOException {
+        if ( connected ) throw new IOException("NioSender is already in connected state.");
+        if ( buf == null ) {
+            if ( direct ) buf = ByteBuffer.allocateDirect(txBufSize);
+            else buf = ByteBuffer.allocate(txBufSize);
+        }
+        InetSocketAddress addr = new InetSocketAddress(address,port);
+        if ( socketChannel != null ) throw new IOException("Socket channel has already been
established. Connection might be in progress.");
+        socketChannel = SocketChannel.open();
+        socketChannel.configureBlocking(false);
+        socketChannel.connect(addr);
+        socketChannel.register(getSelector(),SelectionKey.OP_CONNECT,this);
+        this.connected = true;
+    }
+    
+
+    /**
+     * disconnect
+     *
+     * @todo Implement this org.apache.catalina.tribes.tcp.IDataSender method
+     */
+    public void disconnect() {
+        try {
+            this.connected = false;
+            if ( buf != null ) buf.clear();
+            socketChannel.close();
+            socketChannel = null;
+            curPos = 0;
+        } catch ( Exception x ) {
+            log.error("Unable to disconnect.",x);
+        }
+
+    }
+    
+    /**
+    * sendMessage
+    *
+    * @param data ChannelMessage
+    * @throws IOException
+    * @todo Implement this org.apache.catalina.tribes.tcp.IDataSender method
+    */
+   public synchronized void setMessage(ChannelMessage data) throws IOException {
+       this.current = data;
+       if ( data != null ) {
+           if (!this.connected) {
+               connect();
+           } else {
+               socketChannel.register(getSelector(), SelectionKey.OP_WRITE, this);
+           }
+       }
+   }
+
+
+    /**
+     * checkKeepAlive
+     *
+     * @return boolean
+     * @todo Implement this org.apache.catalina.tribes.tcp.IDataSender method
+     */
+    public boolean checkKeepAlive() {
+        return false;
+    }
+
+    /**
+     * getAckTimeout
+     *
+     * @return long
+     * @todo Implement this org.apache.catalina.tribes.tcp.IDataSender method
+     */
+    public long getAckTimeout() {
+        return this.ackTimeout;
+    }
+
+    /**
+     * getAddress
+     *
+     * @return InetAddress
+     * @todo Implement this org.apache.catalina.tribes.tcp.IDataSender method
+     */
+    public InetAddress getAddress() {
+        return address;
+    }
+
+    /**
+     * getDomain
+     *
+     * @return String
+     * @todo Implement this org.apache.catalina.tribes.tcp.IDataSender method
+     */
+    public String getDomain() {
+        return domain;
+    }
+
+    /**
+     * getPort
+     *
+     * @return int
+     * @todo Implement this org.apache.catalina.tribes.tcp.IDataSender method
+     */
+    public int getPort() {
+        return port;
+    }
+
+    /**
+     * getSuspect
+     *
+     * @return boolean
+     * @todo Implement this org.apache.catalina.tribes.tcp.IDataSender method
+     */
+    public boolean getSuspect() {
+        return suspect;
+    }
+
+    /**
+     * isConnected
+     *
+     * @return boolean
+     * @todo Implement this org.apache.catalina.tribes.tcp.IDataSender method
+     */
+    public boolean isConnected() {
+        return connected;
+    }
+
+    /**
+     * isWaitForAck
+     *
+     * @return boolean
+     * @todo Implement this org.apache.catalina.tribes.tcp.IDataSender method
+     */
+    public boolean getWaitForAck() {
+        return waitForAck;
+    }
+
+    public Selector getSelector() {
+        return selector;
+    }
+
+    public boolean getDirect() {
+        return direct;
+    }
+
+   
+    /**
+     * setAckTimeout
+     *
+     * @param timeout long
+     * @todo Implement this org.apache.catalina.tribes.tcp.IDataSender method
+     */
+    public void setAckTimeout(long timeout) {
+        this.ackTimeout = timeout;
+    }
+
+    /**
+     * setAddress
+     *
+     * @param address InetAddress
+     * @todo Implement this org.apache.catalina.tribes.tcp.IDataSender method
+     */
+    public void setAddress(InetAddress address) {
+        this.address = address;
+    }
+
+    /**
+     * setDomain
+     *
+     * @param domain String
+     * @todo Implement this org.apache.catalina.tribes.tcp.IDataSender method
+     */
+    public void setDomain(String domain) {
+        this.domain = domain;
+    }
+
+    /**
+     * setPort
+     *
+     * @param port int
+     * @todo Implement this org.apache.catalina.tribes.tcp.IDataSender method
+     */
+    public void setPort(int port) {
+        this.port = port;
+    }
+
+    /**
+     * setRxBufSize
+     *
+     * @param size int
+     * @todo Implement this org.apache.catalina.tribes.tcp.IDataSender method
+     */
+    public void setRxBufSize(int size) {
+        this.rxBufSize = size;
+    }
+
+    /**
+     * setSuspect
+     *
+     * @param suspect boolean
+     * @todo Implement this org.apache.catalina.tribes.tcp.IDataSender method
+     */
+    public void setSuspect(boolean suspect) {
+        this.suspect = suspect;
+    }
+
+    /**
+     * setTxBufSize
+     *
+     * @param size int
+     * @todo Implement this org.apache.catalina.tribes.tcp.IDataSender method
+     */
+    public void setTxBufSize(int size) {
+        this.txBufSize= size;
+    }
+
+    /**
+     * setWaitForAck
+     *
+     * @param isWaitForAck boolean
+     * @todo Implement this org.apache.catalina.tribes.tcp.IDataSender method
+     */
+    public void setWaitForAck(boolean waitForAck) {
+        this.waitForAck=waitForAck;
+    }
+
+    public void setSelector(Selector selector) {
+        this.selector = selector;
+    }
+
+    public void setDirect(boolean directBuffer) {
+        this.direct = directBuffer;
+    }
+
+}
\ No newline at end of file

Added: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/ParallelNioSender.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/ParallelNioSender.java?rev=382188&view=auto
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/ParallelNioSender.java
(added)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/ParallelNioSender.java
Wed Mar  1 15:04:11 2006
@@ -0,0 +1,34 @@
+/*
+ * Copyright 1999,2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.catalina.tribes.tcp;
+
+/**
+ * <p>Title: </p>
+ *
+ * <p>Description: </p>
+ *
+ * <p>Copyright: Copyright (c) 2005</p>
+ *
+ * <p>Company: </p>
+ *
+ * @author Filip Hanik
+ * @version 1.0
+ */
+public class ParallelNioSender {
+    public ParallelNioSender() {
+    }
+}
\ No newline at end of file

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/PooledSocketSender.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/PooledSocketSender.java?rev=382188&r1=382187&r2=382188&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/PooledSocketSender.java
(original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/PooledSocketSender.java
Wed Mar  1 15:04:11 2006
@@ -235,7 +235,7 @@
             sender.setKeepAliveMaxRequestCount(parent.getKeepAliveMaxRequestCount());
             sender.setKeepAliveTimeout(parent.getKeepAliveTimeout());
             sender.setAckTimeout(parent.getAckTimeout());
-            sender.setWaitForAck(parent.isWaitForAck());
+            sender.setWaitForAck(parent.getWaitForAck());
             sender.setResend(parent.isResend());
             sender.setRxBufSize(parent.getRxBufSize());
             sender.setTxBufSize(parent.getTxBufSize());

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/TcpReplicationThread.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/TcpReplicationThread.java?rev=382188&r1=382187&r2=382188&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/TcpReplicationThread.java
(original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/TcpReplicationThread.java
Wed Mar  1 15:04:11 2006
@@ -41,7 +41,7 @@
     public static final int OPTION_SYNCHRONIZED = 0x0002;
     public static final int OPTION_DIRECT_BUFFER = 0x0004;
 
-    public static final byte[] ACK_COMMAND = new byte[] {6, 2, 3};
+    
     private static org.apache.commons.logging.Log log =
         org.apache.commons.logging.LogFactory.getLog( TcpReplicationThread.class );
     private ByteBuffer buffer = null;
@@ -222,7 +222,7 @@
     protected void sendAck(SelectionKey key, SocketChannel channel) {
         
         try {
-            channel.write(ByteBuffer.wrap(ACK_COMMAND));
+            channel.write(ByteBuffer.wrap(Constants.ACK_COMMAND));
             if (log.isTraceEnabled()) {
                 log.trace("ACK sent to " + channel.socket().getPort());
             }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message