From: pero <pero@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 26 Apr 2007 04:58:20 +0000 (+0000)
Subject: remove unused flag!
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=f07187f4d73a9b4a1489f0645fb7fd80853c9129;p=tomcat7.0

remove unused flag!

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@532608 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/catalina/tribes/transport/bio/BioSender.java b/java/org/apache/catalina/tribes/transport/bio/BioSender.java
index 4666fe9e6..d6edbf5ef 100644
--- a/java/org/apache/catalina/tribes/transport/bio/BioSender.java
+++ b/java/org/apache/catalina/tribes/transport/bio/BioSender.java
@@ -118,13 +118,11 @@ public class BioSender extends AbstractSender implements DataSender {
      *      ChannelMessage)
      */
     public  void sendMessage(byte[] data, boolean waitForAck) throws IOException {
-        boolean messageTransfered = false ;
         IOException exception = null;
         setAttempt(0);
         try {
              // first try with existing connection
              pushMessage(data,false,waitForAck);
-             messageTransfered = true ;
         } catch (IOException x) {
             SenderState.getSenderState(getDestination()).setSuspect();
             exception = x;
@@ -134,7 +132,6 @@ public class BioSender extends AbstractSender implements DataSender {
                     setAttempt(getAttempt()+1);
                     // second try with fresh connection
                     pushMessage(data, true,waitForAck);
-                    messageTransfered = true;
                     exception = null;
                 } catch (IOException xx) {
                     exception = xx;
@@ -144,13 +141,8 @@ public class BioSender extends AbstractSender implements DataSender {
         } finally {
             setRequestCount(getRequestCount()+1);
             keepalive();
-            if(messageTransfered) {
-
-            } else {
-                if ( exception != null ) throw exception;
-            }
+            if ( exception != null ) throw exception;
         }
-
     }
 
     
@@ -170,7 +162,7 @@ public class BioSender extends AbstractSender implements DataSender {
      * open real socket and set time out when waitForAck is enabled
      * is socket open return directly
      */
-    protected  void openSocket() throws IOException {
+    protected void openSocket() throws IOException {
        if(isConnected()) return ;
        try {
            socket = new Socket();
@@ -207,7 +199,7 @@ public class BioSender extends AbstractSender implements DataSender {
      * @see DataSender#disconnect()
      * @see DataSender#closeSocket()
      */
-    protected  void closeSocket() {
+    protected void closeSocket() {
         if(isConnected()) {
              if (socket != null) {
                 try {
@@ -244,7 +236,7 @@ public class BioSender extends AbstractSender implements DataSender {
      * @since 5.5.10
      */
     
-    protected  void pushMessage(byte[] data, boolean reconnect, boolean waitForAck) throws IOException {
+    protected void pushMessage(byte[] data, boolean reconnect, boolean waitForAck) throws IOException {
         keepalive();
         if ( reconnect ) closeSocket();
         if (!isConnected()) openSocket();
@@ -262,7 +254,7 @@ public class BioSender extends AbstractSender implements DataSender {
      * @throws java.io.IOException
      * @throws java.net.SocketTimeoutException
      */
-    protected  void waitForAck() throws java.io.IOException {
+    protected void waitForAck() throws java.io.IOException {
         try {
             boolean ackReceived = false;
             boolean failAckReceived = false;