svn commit: r1205921 - in /mina/trunk/core/src: main/java/org/apache/mina/api/IoSession.java main/java/org/apache/mina/transport/tcp/NioTcpSession.java test/java/org/apache/mina/session/AbstractIoSessionTest.java

[el...@apache.org]

Author: elecharny
Date: Thu Nov 24 16:36:59 2011
New Revision: 1205921

URL: http://svn.apache.org/viewvc?rev=1205921&view=rev
Log:
o Added 2 additional states for session : SECURING and CONNECTED_SECURED
o Added missing @inheritdoc
o Added the isSecuring and isSecured methods to the Session interface

Modified:
    mina/trunk/core/src/main/java/org/apache/mina/api/IoSession.java
    mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/NioTcpSession.java
    mina/trunk/core/src/test/java/org/apache/mina/session/AbstractIoSessionTest.java

Modified: mina/trunk/core/src/main/java/org/apache/mina/api/IoSession.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/api/IoSession.java?rev=1205921&r1=1205920&r2=1205921&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/api/IoSession.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/api/IoSession.java Thu Nov 24 16:36:59 2011
@@ -98,6 +98,20 @@ public interface IoSession {
     boolean isClosing();
 
     /**
+     * Tells if the session is processing a SSL/TLS handshake.
+     * 
+     * @return <code>true</tt> if and only if this session is processing a SSL/TLS handshake.
+     */
+    boolean isSecuring();
+
+    /**
+     * Tells if the session is using SSL/TLS.
+     * 
+     * @return <code>true</tt> if and only if this session is exchanging data over a SSL/TLS connection
+     */
+    boolean isSecured();
+
+    /**
      * Closes this session immediately or after all queued write requests are flushed. This operation is asynchronous.
      * Wait for the returned {@link IoFuture} if you want to wait for the session actually closed. Once this method has
      * been called, no incoming request will be accepted.
@@ -243,7 +257,7 @@ public interface IoSession {
      * 
      */
     public enum SessionState {
-        CREATED, CONNECTED, CLOSING, CLOSED
+        CREATED, CONNECTED, CLOSING, CLOSED, SECURING, CONNECTED_SECURED
     }
 
     /* SESSION WRITING */

Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/NioTcpSession.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/NioTcpSession.java?rev=1205921&r1=1205920&r2=1205921&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/NioTcpSession.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/NioTcpSession.java Thu Nov 24 16:36:59 2011
@@ -85,48 +85,87 @@ public class NioTcpSession extends Abstr
         return (InetSocketAddress) socket.getLocalSocketAddress();
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public boolean isConnected() {
         // TODO Auto-generated method stub
         return false;
     }
+    
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean isSecuring() {
+        return state == SessionState.SECURING;
+    }
+    
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean isSecured() {
+        return state == SessionState.CONNECTED_SECURED;
+    }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public boolean isClosing() {
         // TODO Auto-generated method stub
         return false;
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public IoFuture<Void> close(boolean immediately) {
         // TODO Auto-generated method stub
         return null;
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public void suspendRead() {
         // TODO Auto-generated method stub
 
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public void suspendWrite() {
         // TODO Auto-generated method stub
 
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public void resumeRead() {
         // TODO Auto-generated method stub
 
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public void resumeWrite() {
         // TODO Auto-generated method stub
-
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public boolean isReadSuspended() {
         // TODO Auto-generated method stub
@@ -134,7 +173,7 @@ public class NioTcpSession extends Abstr
     }
 
     /**
-     * @inh
+     * {@inheritDoc}
      */
     @Override
     public boolean isWriteSuspended() {
@@ -142,6 +181,9 @@ public class NioTcpSession extends Abstr
         return false;
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public SocketSessionConfig getConfig() {
         return configuration;

Modified: mina/trunk/core/src/test/java/org/apache/mina/session/AbstractIoSessionTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/session/AbstractIoSessionTest.java?rev=1205921&r1=1205920&r2=1205921&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/session/AbstractIoSessionTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/session/AbstractIoSessionTest.java Thu Nov 24 16:36:59 2011
@@ -93,6 +93,18 @@ public class AbstractIoSessionTest {
         @Override
         public void suspendWrite() {
         }
+
+        @Override
+        public boolean isSecuring()
+        {
+            return false;
+        }
+
+        @Override
+        public boolean isSecured()
+        {
+            return false;
+        }
     }
 
     private IoService service = null;