Revision: 0da0a56383b3
Author: deruelle_jean <deruelle_jean@8e71dc83-d81e-6649-80f2-80b843a9b2be>
Date: Fri Sep 27 10:22:17 2013 UTC
Log: Fixes Issue 14
JSIP Repo https://java.net/jira/browse/JSIP-457
git-svn-id: https://svn.java.net/svn/jsip~svn/trunk@2296
8e71dc83-d81e-6649-80f2-80b843a9b2be
http://code.google.com/p/jain-sip/source/detail?r=0da0a56383b3
Modified:
/src/gov/nist/javax/sip/stack/TLSMessageChannel.java
/src/gov/nist/javax/sip/stack/TLSMessageProcessor.java
=======================================
--- /src/gov/nist/javax/sip/stack/TLSMessageChannel.java Tue Mar 12
16:25:55 2013 UTC
+++ /src/gov/nist/javax/sip/stack/TLSMessageChannel.java Fri Sep 27
10:22:17 2013 UTC
@@ -535,7 +535,26 @@
}
} catch (IOException e) {
logger.logError("A problem occured while Accepting
connection", e);
- return;
+ //
https://code.google.com/p/jain-sip/issues/detail?id=14 clean up
+
sslSock.removeHandshakeCompletedListener(handshakeCompletedListener);
+ handshakeCompletedListener = null;
+ try {
+ myClientInputStream.close();
+ } catch (IOException e1) {
+ // ignore
+ } finally {
+ myClientInputStream = null;
+ }
+
+ try {
+ mySock.close();
+ } catch (IOException e1) {
+ // ignore
+ } finally {
+ mySock = null;
+ }
+
+ return;
}
}
super.run();
=======================================
--- /src/gov/nist/javax/sip/stack/TLSMessageProcessor.java Tue Dec 11
14:00:28 2012 UTC
+++ /src/gov/nist/javax/sip/stack/TLSMessageProcessor.java Fri Sep 27
10:22:17 2013 UTC
@@ -193,7 +193,10 @@
TLSMessageChannel newChannel = new
TLSMessageChannel(newsock, sipStack, this, "TLSMessageChannelThread-" +
nConnections);
if (logger.isLoggingEnabled(LogWriter.TRACE_DEBUG))
logger.logDebug(Thread.currentThread() + " adding
incoming channel " + newChannel.getKey());
- incomingMessageChannels.put(newChannel.getKey(),
newChannel);
+ // https://code.google.com/p/jain-sip/issues/detail?id=14
add it only if the handshake has been completed successfully
+ if(newChannel.isHandshakeCompleted()) {
+ incomingMessageChannels.put(newChannel.getKey(),
newChannel);
+ }
} catch (Exception ex) {
logger.logError("A problem occured while Accepting
connection", ex);
}
--
---
You received this message because you are subscribed to the Google Groups "mobicents-commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.