fhanik 2004/01/12 21:46:21
Modified: modules/cluster/src/share/org/apache/catalina/cluster/tcp
PooledSocketSender.java
Log:
print out a warning if no socket is returned from the pool and we are still connected
Revision Changes Path
1.3 +11 -5
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PooledSocketSender.java 13 Jan 2004 04:22:28 -0000 1.2
+++ PooledSocketSender.java 13 Jan 2004 05:46:21 -0000 1.3
@@ -86,9 +86,9 @@
private InetAddress address;
private int port;
private Socket sc = null;
- private boolean isSocketConnected = false;
+ private boolean isSocketConnected = true;
private boolean suspect;
- private long ackTimeout = 150*1000; //15 seconds socket read timeout (for
acknowledgement)
+ private long ackTimeout = 15*1000; //15 seconds socket read timeout (for
acknowledgement)
private long keepAliveTimeout = 60*1000; //keep socket open for no more than
one min
private int keepAliveMaxRequestCount = 100; //max 100 requests before
reconnecting
private long keepAliveConnectTime = 0;
@@ -118,11 +118,13 @@
{
//do nothing, happens in the socket sender itself
senderQueue.open();
+ isSocketConnected = true;
}
public void disconnect()
{
senderQueue.close();
+ isSocketConnected = false;
}
public boolean isConnected()
@@ -156,6 +158,10 @@
{
//get a socket sender from the pool
SocketSender sender = senderQueue.getSender(0);
+ if ( sender == null && isConnected() ) {
+ log.warn("No socket sender available for
client="+this.getAddress()+":"+this.getPort());
+ return;
+ }//end if
//send the message
sender.sendMessage(sessionId,data);
//return the connection to the pool
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
