fhanik 2005/04/14 13:07:59
Modified: modules/cluster/src/share/org/apache/catalina/cluster/tcp
PooledSocketSender.java ReplicationTransmitter.java
Log:
Fixed auto format
Revision Changes Path
1.12 +3 -11
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/PooledSocketSender.java
Index: PooledSocketSender.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/PooledSocketSender.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- PooledSocketSender.java 10 Apr 2005 16:20:46 -0000 1.11
+++ PooledSocketSender.java 14 Apr 2005 20:07:59 -0000 1.12
@@ -115,8 +115,7 @@
}
SocketSender sender = senderQueue.getSender(0);
if (sender == null) {
- log.warn(sm.getString("PoolSocketSender.noMoreSender", this
- .getAddress(), new Integer(this.getPort())));
+ log.warn(sm.getString("PoolSocketSender.noMoreSender",
this.getAddress(), new Integer(this.getPort())));
return;
}
//send the message
@@ -199,14 +198,7 @@
mutex.wait(timeout);
} catch (Exception x) {
PooledSocketSender.log
- .warn(
- sm
- .getString(
-
"PoolSocketSender.senderQueue.sender.failed",
-
parent.getAddress(),
- new
Integer(parent
-
.getPort())),
- x);
+
.warn(sm.getString("PoolSocketSender.senderQueue.sender.failed",parent.getAddress(),new
Integer(parent.getPort())),x);
}//catch
}//end if
if (sender != null) {
@@ -266,4 +258,4 @@
}
}
}
-}
\ No newline at end of file
+}
1.26 +3 -6
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ReplicationTransmitter.java
Index: ReplicationTransmitter.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ReplicationTransmitter.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ReplicationTransmitter.java 12 Apr 2005 18:56:07 -0000 1.25
+++ ReplicationTransmitter.java 14 Apr 2005 20:07:59 -0000 1.26
@@ -815,10 +815,7 @@
} catch (Exception x) {
if (log.isWarnEnabled()) {
if (!sender.getSuspect()) {
- log
- .warn(
- "Unable to send replicated message, is
server down?",
- x);
+ log.warn("Unable to send replicated message, is server
down?",x);
}
}
sender.setSuspect(true);
@@ -840,4 +837,4 @@
}
-}
\ No newline at end of file
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
