tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fha...@apache.org
Subject svn commit: r385664 - in /tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio: BioSender.java MultiSocketSender.java
Date Mon, 13 Mar 2006 21:45:27 GMT
Author: fhanik
Date: Mon Mar 13 13:45:27 2006
New Revision: 385664

URL: http://svn.apache.org/viewcvs?rev=385664&view=rev
Log:
Removed all synchronization, it happens in the class above

Removed:
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/MultiSocketSender.java
Modified:
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/BioSender.java

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/BioSender.java
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/BioSender.java?rev=385664&r1=385663&r2=385664&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/BioSender.java
(original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/bio/BioSender.java
Mon Mar 13 13:45:27 2006
@@ -298,7 +298,7 @@
      * Connect other cluster member receiver 
      * @see org.apache.catalina.tribes.tcp.IDataSender#connect()
      */
-    public synchronized void connect() throws ChannelException {
+    public  void connect() throws ChannelException {
         try {
             openSocket();
         }catch ( Exception x ) {
@@ -312,7 +312,7 @@
      * 
      * @see IDataSender#disconnect()
      */
-    public synchronized void disconnect() {
+    public  void disconnect() {
         boolean connect = isConnected();
         closeSocket();
         if (connect) {
@@ -330,7 +330,7 @@
      * @return true, is socket close
      * @see DataSender#closeSocket()
      */
-    public synchronized boolean keepalive() {
+    public  boolean keepalive() {
         boolean isCloseSocket = true ;
         if(isConnected()) {
             if ((keepAliveTimeout > -1 && (System.currentTimeMillis() - keepAliveConnectTime)
> keepAliveTimeout)
@@ -349,7 +349,7 @@
      * @see org.apache.catalina.tribes.tcp.IDataSender#sendMessage(,
      *      ChannelMessage)
      */
-    public synchronized void sendMessage(byte[] data) throws IOException {
+    public  void sendMessage(byte[] data) throws IOException {
         pushMessage(data);
     }
 
@@ -370,7 +370,7 @@
      * open real socket and set time out when waitForAck is enabled
      * is socket open return directly
      */
-    protected synchronized void openSocket() throws IOException {
+    protected  void openSocket() throws IOException {
        if(isConnected()) return ;
        try {
            socket = new Socket();
@@ -399,7 +399,7 @@
      * @see DataSender#disconnect()
      * @see DataSender#closeSocket()
      */
-    protected synchronized void closeSocket() {
+    protected  void closeSocket() {
         if(isConnected()) {
              if (socket != null) {
                 try {
@@ -434,7 +434,7 @@
      * @since 5.5.10
      */
     
-    protected synchronized void pushMessage(byte[] data, boolean reconnect) throws IOException
{
+    protected  void pushMessage(byte[] data, boolean reconnect) throws IOException {
         keepalive();
         if ( reconnect ) closeSocket();
         if (!isConnected()) openSocket();
@@ -442,7 +442,7 @@
         writeData(data);
     }
     
-    protected synchronized void pushMessage( byte[] data) throws IOException {
+    protected  void pushMessage( byte[] data) throws IOException {
         boolean messageTransfered = false ;
         IOException exception = null;
         try {
@@ -480,7 +480,7 @@
      * @throws IOException
      * @since 5.5.10
      */
-    protected synchronized void writeData(byte[] data) throws IOException { 
+    protected  void writeData(byte[] data) throws IOException { 
         socket.getOutputStream().write(data);
         socket.getOutputStream().flush();
         if (getWaitForAck()) waitForAck();
@@ -493,7 +493,7 @@
      * @throws java.io.IOException
      * @throws java.net.SocketTimeoutException
      */
-    protected synchronized void waitForAck() throws java.io.IOException {
+    protected  void waitForAck() throws java.io.IOException {
         try {
             boolean ackReceived = false;
             ackbuf.clear();



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


Mime
View raw message