fhanik 2005/04/14 14:26:28
Modified: modules/cluster/src/share/org/apache/catalina/cluster/tcp
DataSender.java ReplicationTransmitter.java
Log:
Refactor method name to make sense
Revision Changes Path
1.9 +4 -4
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/DataSender.java
Index: DataSender.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/DataSender.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DataSender.java 14 Apr 2005 21:12:31 -0000 1.8
+++ DataSender.java 14 Apr 2005 21:26:28 -0000 1.9
@@ -508,7 +508,7 @@
* @return true, is socket close
* @see DataSender#closeSocket()
*/
- public synchronized boolean checkIfCloseSocket() {
+ public synchronized boolean checkKeepAlive() {
boolean isCloseSocket = true ;
if(isConnected()) {
if ((keepAliveTimeout > -1
@@ -697,7 +697,7 @@
time = System.currentTimeMillis();
}
synchronized(this) {
- checkIfCloseSocket();
+ checkKeepAlive();
if (!isConnected())
openSocket();
}
@@ -716,7 +716,7 @@
writeData(data);
} finally {
this.keepAliveCount++;
- checkIfCloseSocket();
+ checkKeepAlive();
if(doProcessingStats) {
addProcessingStats(time);
}
1.28 +2 -2
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.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ReplicationTransmitter.java 14 Apr 2005 21:12:31 -0000 1.27
+++ ReplicationTransmitter.java 14 Apr 2005 21:26:28 -0000 1.28
@@ -550,7 +550,7 @@
IDataSender sender = (IDataSender) ((java.util.Map.Entry)
iter
.next()).getValue();
if (sender != null && sender instanceof DataSender)
- ((DataSender) sender).checkIfCloseSocket();
+ ((DataSender) sender).checkKeepAlive();
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]