[jain-sip] push by jean.deruelle - Removing WebSockets code from ts1 that was wrongly commited on 2012-12-05 07:25 GMT

[jain-sip]

Revision: eeade4c19a36
Author:   Jean Deruelle <jean.derue...@gmail.com>
Date:     Tue Dec  4 23:24:48 2012
Log:      Removing WebSockets code from ts1 that was wrongly commited
http://code.google.com/p/jain-sip/source/detail?r=eeade4c19a36

Modified:
 /src/gov/nist/javax/sip/stack/NioTcpMessageChannel.java
 /src/gov/nist/javax/sip/stack/SIPTransaction.java

=======================================
--- /src/gov/nist/javax/sip/stack/NioTcpMessageChannel.java	Thu Nov  8  
03:20:16 2012
+++ /src/gov/nist/javax/sip/stack/NioTcpMessageChannel.java	Tue Dec  4  
23:24:48 2012
@@ -101,7 +101,7 @@
                        }

                        try {
-                               if 
(logger.isLoggingEnabled(LogWriter.TRACE_DEBUG))
+                               if 
(logger.isLoggingEnabled(LogWriter.TRACE_DEBUG)) {
 					logger.logDebug("IOException  closing sock " + ex  
+ "myAddress:myport " + myAddress + ":" + myPort + ",  
remoteAddress:remotePort " + peerAddress + ":" + peerPort);
                                }

=======================================
--- /src/gov/nist/javax/sip/stack/SIPTransaction.java	Thu Nov  8 08:56:17  
2012
+++ /src/gov/nist/javax/sip/stack/SIPTransaction.java	Tue Dec  4 23:24:48  
2012
@@ -1402,15 +1402,6 @@
                } else {
                        return null;
                }
-        } else if(this.getMessageChannel() instanceof  
NioTlsWebSocketMessageChannel) {
-        	SSLEngine sslEngine = ((NioTlsWebSocketMessageChannel)  
this.getMessageChannel()).sslStateMachine.sslEngine;
-        	 
if(sslEngine.getHandshakeStatus().equals(HandshakeStatus.FINISHED) ||
-        			 
sslEngine.getHandshakeStatus().equals(HandshakeStatus.NOT_HANDSHAKING)) {
-                       String[] cs = sslEngine.getEnabledCipherSuites();
-                       return cs[0];
-               } else {
-                       return null;
-               }
         } else throw new UnsupportedOperationException("Not a TLS  
channel");

     }
@@ -1431,14 +1422,6 @@
                } else {
                        return null;
                }
-        } else if (this.getMessageChannel() instanceof  
NioTlsMessageChannel) {
-        	SSLEngine sslEngine = ((NioTlsWebSocketMessageChannel)  
this.getMessageChannel()).sslStateMachine.sslEngine;
-        	 
if(sslEngine.getHandshakeStatus().equals(HandshakeStatus.FINISHED) ||
-        			 
sslEngine.getHandshakeStatus().equals(HandshakeStatus.NOT_HANDSHAKING)) {
-        		return ((NioTlsWebSocketMessageChannel)  
this.getMessageChannel()).sslStateMachine.sslEngine.getSession().getLocalCertificates();
-               } else {
-                       return null;
-               }
         } else throw new UnsupportedOperationException("Not a TLS  
channel");
     }

@@ -1458,17 +1441,7 @@
                } else {
                        return null;
                }
-        } else if(this.getMessageChannel() instanceof  
NioTlsWebSocketMessageChannel) {
-        	SSLEngine sslEngine = ((NioTlsWebSocketMessageChannel)  
this.getMessageChannel()).sslStateMachine.sslEngine;
-        	 
if(sslEngine.getHandshakeStatus().equals(HandshakeStatus.FINISHED) ||
-        			 
sslEngine.getHandshakeStatus().equals(HandshakeStatus.NOT_HANDSHAKING)) {
-        		return ((NioTlsWebSocketMessageChannel)  
this.getMessageChannel()).sslStateMachine.sslEngine.getSession().getPeerCertificates();
-               } else {
-                       return null;
-               }
-        }
-        else
-               throw new UnsupportedOperationException("Not a TLS channel");
+        } else throw new UnsupportedOperationException("Not a TLS  
channel");


     }