Revision: b613c754c135
Author: Jean Deruelle <[email protected]>
Date: Tue Dec 11 01:02:59 2012
Log: Fix regression on testsuite after merge with NIO Branch
http://code.google.com/p/jain-sip/source/detail?r=b613c754c135
Modified:
/src/gov/nist/javax/sip/stack/ConnectionOrientedMessageChannel.java
/src/gov/nist/javax/sip/stack/TCPMessageChannel.java
/src/gov/nist/javax/sip/stack/TLSMessageChannel.java
=======================================
--- /src/gov/nist/javax/sip/stack/ConnectionOrientedMessageChannel.java Fri
Nov 23 08:22:14 2012
+++ /src/gov/nist/javax/sip/stack/ConnectionOrientedMessageChannel.java Tue
Dec 11 01:02:59 2012
@@ -832,7 +832,7 @@
if(sipListener!= null && sipListener instanceof
SipListenerExt
// making sure that we don't notify each listening point
but only the one on which the timeout happened
&&
listeningPoint.getIPAddress().equalsIgnoreCase(myAddress) &&
listeningPoint.getPort() == myPort &&
-
listeningPoint.getTransport().equals(getTransport())) {
+
listeningPoint.getTransport().equalsIgnoreCase(getTransport())) {
((SipListenerExt)sipListener).processIOException(new
IOExceptionEventExt(nextProvider, Reason.KeepAliveTimeout, myAddress,
myPort,
peerAddress.getHostAddress(), peerPort, getTransport()));
}
=======================================
--- /src/gov/nist/javax/sip/stack/TCPMessageChannel.java Fri Nov 23
08:22:14 2012
+++ /src/gov/nist/javax/sip/stack/TCPMessageChannel.java Tue Dec 11
01:02:59 2012
@@ -198,15 +198,15 @@
if (logger.isLoggingEnabled(LogWriter.TRACE_DEBUG)) {
logger.logDebug("Closing message Channel (key = " + key
+")" + this);
}
-
- cancelPingKeepAliveTimeoutTaskIfStarted();
-
} else {
if (logger.isLoggingEnabled(LogWriter.TRACE_DEBUG)) {
String ioHandlerKey = key.substring(4);
logger.logDebug("not removing socket key from the cached
map since it has already been updated by the iohandler.sendBytes " +
ioHandlerKey);
}
}
+ if(stopKeepAliveTask) {
+ cancelPingKeepAliveTimeoutTaskIfStarted();
+ }
}
=======================================
--- /src/gov/nist/javax/sip/stack/TLSMessageChannel.java Thu Dec 6
14:40:43 2012
+++ /src/gov/nist/javax/sip/stack/TLSMessageChannel.java Tue Dec 11
01:02:59 2012
@@ -199,16 +199,15 @@
if (logger.isLoggingEnabled(LogWriter.TRACE_DEBUG)) {
logger.logDebug("Closing message Channel (key = " + key
+")" + this);
}
-
- cancelPingKeepAliveTimeoutTaskIfStarted();
-
} else {
if (logger.isLoggingEnabled(LogWriter.TRACE_DEBUG)) {
String ioHandlerKey = key.substring(4);
logger.logDebug("not removing socket key from the cached map since
it has already been updated by the iohandler.sendBytes " + ioHandlerKey);
}
}
-
+ if(stopKeepAliveTask) {
+ cancelPingKeepAliveTimeoutTaskIfStarted();
+ }
}
/**
