You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by pe...@apache.org on 2007/04/26 06:58:21 UTC
svn commit: r532608 -
/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java
Author: pero
Date: Wed Apr 25 21:58:20 2007
New Revision: 532608
URL: http://svn.apache.org/viewvc?view=rev&rev=532608
Log:
remove unused flag!
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java?view=diff&rev=532608&r1=532607&r2=532608
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java Wed Apr 25 21:58:20 2007
@@ -118,13 +118,11 @@
* 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 @@
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 @@
} finally {
setRequestCount(getRequestCount()+1);
keepalive();
- if(messageTransfered) {
-
- } else {
- if ( exception != null ) throw exception;
- }
+ if ( exception != null ) throw exception;
}
-
}
@@ -170,7 +162,7 @@
* 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 @@
* @see DataSender#disconnect()
* @see DataSender#closeSocket()
*/
- protected void closeSocket() {
+ protected void closeSocket() {
if(isConnected()) {
if (socket != null) {
try {
@@ -244,7 +236,7 @@
* @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 @@
* @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;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org