svn commit: r1211032 - in /mina/trunk/core/src/main/java/org/apache/mina/service: AbstractIoService.java SelectorProcessor.java server/AbstractIoServer.java

[elecharny]

Author: elecharny
Date: Tue Dec  6 17:10:54 2011
New Revision: 1211032

URL: http://svn.apache.org/viewvc?rev=1211032&view=rev
Log: (empty)

Modified:
    mina/trunk/core/src/main/java/org/apache/mina/service/AbstractIoService.java
    mina/trunk/core/src/main/java/org/apache/mina/service/SelectorProcessor.java
    
mina/trunk/core/src/main/java/org/apache/mina/service/server/AbstractIoServer.java

Modified: 
mina/trunk/core/src/main/java/org/apache/mina/service/AbstractIoService.java
URL: 
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/service/AbstractIoService.java?rev=1211032&r1=1211031&r2=1211032&view=diff
==============================================================================
--- 
mina/trunk/core/src/main/java/org/apache/mina/service/AbstractIoService.java 
(original)
+++ 
mina/trunk/core/src/main/java/org/apache/mina/service/AbstractIoService.java 
Tue Dec  6 17:10:54 2011
@@ -297,8 +297,12 @@ public abstract class AbstractIoService 
         }
     }
     
-    public void addSslContext(SSLContext sslContext) {
+    /**
+     * {@inheritDoc}
+     */
+    public void setSslContext(SSLContext sslContext) {
         this.sslContext = sslContext;
+        mode = ServiceMode.SECURED;
     }
     
     /**

Modified: 
mina/trunk/core/src/main/java/org/apache/mina/service/SelectorProcessor.java
URL: 
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/service/SelectorProcessor.java?rev=1211032&r1=1211031&r2=1211032&view=diff
==============================================================================
--- 
mina/trunk/core/src/main/java/org/apache/mina/service/SelectorProcessor.java 
(original)
+++ 
mina/trunk/core/src/main/java/org/apache/mina/service/SelectorProcessor.java 
Tue Dec  6 17:10:54 2011
@@ -40,7 +40,7 @@ public interface SelectorProcessor {
      * @param service
      * @param clientChannel
      */
-    void createSession(IoService service, Object clientSocket);
+    void createSession(IoService service, Object clientSocket) throws 
IOException;
 
     /**
      * Bind and start processing this new server address

Modified: 
mina/trunk/core/src/main/java/org/apache/mina/service/server/AbstractIoServer.java
URL: 
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/service/server/AbstractIoServer.java?rev=1211032&r1=1211031&r2=1211032&view=diff
==============================================================================
--- 
mina/trunk/core/src/main/java/org/apache/mina/service/server/AbstractIoServer.java
 (original)
+++ 
mina/trunk/core/src/main/java/org/apache/mina/service/server/AbstractIoServer.java
 Tue Dec  6 17:10:54 2011
@@ -34,5 +34,4 @@ public abstract class AbstractIoServer e
     protected AbstractIoServer() {
         super();
     }
-
 }