[jain-sip] push by jean.deruelle - Update Issue 15... on 2013-01-10 21:26 GMT

[jain-sip]

Revision: be2561eaa61f
Author:   deruelle_jean <deruelle_jean@8e71dc83-d81e-6649-80f2-80b843a9b2be>
Date:     Thu Jan 10 13:25:52 2013
Log:      Update Issue 15
(git repo)
Update Issue JSIP-432
More Fixes for WebSockets TLS support. Not blocking the Channel anymore,  
complete the handshake but don't respond to the HTTP Uprade request yet

git-svn-id: https://svn.java.net/svn/jsip~svn/trunk@2268  
8e71dc83-d81e-6649-80f2-80b843a9b2be

http://code.google.com/p/jain-sip/source/detail?r=be2561eaa61f

Modified:
 /src/gov/nist/javax/sip/stack/NioTlsWebSocketMessageChannel.java
 /src/gov/nist/javax/sip/stack/NioTlsWebSocketMessageProcessor.java

=======================================
--- /src/gov/nist/javax/sip/stack/NioTlsWebSocketMessageChannel.java	Tue  
Dec 11 06:13:13 2012
+++ /src/gov/nist/javax/sip/stack/NioTlsWebSocketMessageChannel.java	Thu  
Jan 10 13:25:52 2013
@@ -51,10 +51,10 @@
        private int appBufferMax;
        private int netBufferMax;

-       public static NioTcpMessageChannel create(
-                       NioTcpMessageProcessor nioTcpMessageProcessor,
+       public static NioTlsWebSocketMessageChannel create(
+                       NioTlsWebSocketMessageProcessor nioTcpMessageProcessor,
                        SocketChannel socketChannel) throws IOException {
-               NioTcpMessageChannel retval = channelMap.get(socketChannel);
+		NioTlsWebSocketMessageChannel retval = (NioTlsWebSocketMessageChannel)  
channelMap.get(socketChannel);
                if (retval == null) {
                        retval = new 
NioTlsWebSocketMessageChannel(nioTcpMessageProcessor,
                                        socketChannel);
=======================================
--- /src/gov/nist/javax/sip/stack/NioTlsWebSocketMessageProcessor.java	Thu  
Jan 10 09:17:30 2013
+++ /src/gov/nist/javax/sip/stack/NioTlsWebSocketMessageProcessor.java	Thu  
Jan 10 13:25:52 2013
@@ -58,6 +58,9 @@

        @Override
 	public NioTcpMessageChannel createMessageChannel(NioTcpMessageProcessor  
nioTcpMessageProcessor, SocketChannel client) throws IOException {
+               if (logger.isLoggingEnabled(LogWriter.TRACE_DEBUG)) {
+    		 
logger.logDebug("NioTlsWebSocketMessageProcessor::createMessageChannel: " +  
nioTcpMessageProcessor + " client " + client);
+       }
 		return  
NioTlsWebSocketMessageChannel.create(NioTlsWebSocketMessageProcessor.this,  
client);
     }