[jain-sip] 2 new revisions pushed by jean.deruelle on 2012-04-04 08:45 GMT

[jain-sip]

2 new revisions:

Revision: d53af56e2f3f
Author:   vralev <vralev@8e71dc83-d81e-6649-80f2-80b843a9b2be>
Date:     Tue Apr  3 06:06:30 2012
Log:      JSIP-416 - small fix for regsression due to (allow flexible  
configurat...
http://code.google.com/p/jain-sip/source/detail?r=d53af56e2f3f
Revision: a49b6ad46eb6
Author:   vralev <vralev@8e71dc83-d81e-6649-80f2-80b843a9b2be>
Date:     Wed Apr  4 01:20:04 2012
Log:      JSIP-416 - clean up the socket when stopping the NIO processor...
http://code.google.com/p/jain-sip/source/detail?r=a49b6ad46eb6

==============================================================================
Revision: d53af56e2f3f
Author:   vralev <vralev@8e71dc83-d81e-6649-80f2-80b843a9b2be>
Date:     Tue Apr  3 06:06:30 2012
Log:      JSIP-416 - small fix for regsression due to (allow flexible  
configuration of TLS keys and trust stores through interface)

git-svn-id:  
https://svn.java.net/svn/jsip~svn/branches/JAIN-SIP-NIO-year-2012@2070  
8e71dc83-d81e-6649-80f2-80b843a9b2be

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

Modified:
 /src/gov/nist/core/net/DefaultSecurityManagerProvider.java

=======================================
--- /src/gov/nist/core/net/DefaultSecurityManagerProvider.java	Tue Apr  3  
03:21:23 2012
+++ /src/gov/nist/core/net/DefaultSecurityManagerProvider.java	Tue Apr  3  
06:06:30 2012
@@ -39,6 +39,11 @@
             passphraseString =  
System.getProperty("javax.net.ssl.keyStorePassword");
         if (keyStoreType == null)
             keyStoreType =  
System.getProperty("javax.net.ssl.keyStoreType");
+
+        if(keyStoreType == null)  {
+        	logger.logDebug("Security manager not specified, TLS settings  
will be inactive");
+               return;
+        }

         KeyStore ks = KeyStore.getInstance(keyStoreType);
         KeyStore ts = KeyStore.getInstance(keyStoreType);

==============================================================================
Revision: a49b6ad46eb6
Author:   vralev <vralev@8e71dc83-d81e-6649-80f2-80b843a9b2be>
Date:     Wed Apr  4 01:20:04 2012
Log:      JSIP-416 - clean up the socket when stopping the NIO processor

git-svn-id:  
https://svn.java.net/svn/jsip~svn/branches/JAIN-SIP-NIO-year-2012@2071  
8e71dc83-d81e-6649-80f2-80b843a9b2be

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

Modified:
 /src/gov/nist/javax/sip/stack/NioTcpMessageProcessor.java

=======================================
--- /src/gov/nist/javax/sip/stack/NioTcpMessageProcessor.java	Tue Apr  3  
01:16:03 2012
+++ /src/gov/nist/javax/sip/stack/NioTcpMessageProcessor.java	Wed Apr  4  
01:20:04 2012
@@ -35,6 +35,8 @@
     protected Thread selectorThread;
     protected NIOHandler nioHandler;

+    protected ServerSocketChannel channel;
+
     // Cache the change request here, the selector thread will read it  
when it wakes up and execute the request
     private List<ChangeRequest> changeRequests = new  
LinkedList<ChangeRequest> ();

@@ -397,11 +399,11 @@
     @Override
     public void start() throws IOException {
         selector = Selector.open();
-        ServerSocketChannel ssc = ServerSocketChannel.open();
-        ssc.configureBlocking(false);
+        channel = ServerSocketChannel.open();
+        channel.configureBlocking(false);
         InetSocketAddress isa  = new  
InetSocketAddress(super.getIpAddress(), super.getPort());
-        ssc.socket().bind(isa);
-        ssc.register(selector, SelectionKey.OP_ACCEPT);
+        channel.socket().bind(isa);
+        channel.register(selector, SelectionKey.OP_ACCEPT);
         selectorThread = new Thread(createProcessorTask());
         selectorThread.start();
         selectorThread.setName("NioSelector-" + selectorThread.getName());
@@ -421,6 +423,11 @@
        } catch (Exception ex) {
                logger.logError("Probelm closing channel " , ex);
        }
+        try {
+            channel.close();
+        } catch (Exception ex) {
+               logger.logError("Problem closing channel " , ex);
+       }
     }

 }