svn commit: r1402104 - in /mina/mina/branches/2.0: mina-core/src/main/java/org/apache/mina/core/polling/ mina-core/src/main/java/org/apache/mina/transport/socket/nio/ mina-example/src/test/java/org/apache/mina/example/echoserver/ssl/

[elecharny]

Author: elecharny
Date: Thu Oct 25 11:29:58 2012
New Revision: 1402104

URL: http://svn.apache.org/viewvc?rev=1402104&view=rev
Log:
Fixed some compilation error due to the wrong usage of the hierarchy, following 
some commit I made this morning

Modified:
    
mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoAcceptor.java
    
mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketAcceptor.java
    
mina/mina/branches/2.0/mina-example/src/test/java/org/apache/mina/example/echoserver/ssl/SslFilterTest.java

Modified: 
mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoAcceptor.java
URL: 
http://svn.apache.org/viewvc/mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoAcceptor.java?rev=1402104&r1=1402103&r2=1402104&view=diff
==============================================================================
--- 
mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoAcceptor.java
 (original)
+++ 
mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoAcceptor.java
 Thu Oct 25 11:29:58 2012
@@ -46,7 +46,6 @@ import org.apache.mina.core.service.Simp
 import org.apache.mina.core.session.AbstractIoSession;
 import org.apache.mina.core.session.IoSession;
 import org.apache.mina.core.session.IoSessionConfig;
-import org.apache.mina.transport.socket.SocketAcceptor;
 import org.apache.mina.transport.socket.SocketSessionConfig;
 import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
 import org.apache.mina.util.ExceptionMonitor;
@@ -67,8 +66,7 @@ import org.apache.mina.util.ExceptionMon
  * 
  * @author <a href="http://mina.apache.org";>Apache MINA Project</a>
  */
-public abstract class AbstractPollingIoAcceptor<S extends AbstractIoSession, 
H> extends AbstractIoAcceptor 
-    implements SocketAcceptor {
+public abstract class AbstractPollingIoAcceptor<S extends AbstractIoSession, 
H> extends AbstractIoAcceptor {
     /** A lock used to protect the selector to be waked up before it's created 
*/
     private final Semaphore lock = new Semaphore(1);
 

Modified: 
mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketAcceptor.java
URL: 
http://svn.apache.org/viewvc/mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketAcceptor.java?rev=1402104&r1=1402103&r2=1402104&view=diff
==============================================================================
--- 
mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketAcceptor.java
 (original)
+++ 
mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketAcceptor.java
 Thu Oct 25 11:29:58 2012
@@ -39,6 +39,7 @@ import org.apache.mina.core.service.IoSe
 import org.apache.mina.core.service.SimpleIoProcessorPool;
 import org.apache.mina.core.service.TransportMetadata;
 import org.apache.mina.transport.socket.DefaultSocketSessionConfig;
+import org.apache.mina.transport.socket.SocketAcceptor;
 
 /**
  * {@link IoAcceptor} for socket transport (TCP/IP).  This class
@@ -46,7 +47,8 @@ import org.apache.mina.transport.socket.
  *
  * @author <a href="http://mina.apache.org";>Apache MINA Project</a>
  */
-public final class NioSocketAcceptor extends 
AbstractPollingIoAcceptor<NioSession, ServerSocketChannel> {
+public final class NioSocketAcceptor extends 
AbstractPollingIoAcceptor<NioSession, ServerSocketChannel> 
+    implements SocketAcceptor {
 
     private volatile Selector selector;
 

Modified: 
mina/mina/branches/2.0/mina-example/src/test/java/org/apache/mina/example/echoserver/ssl/SslFilterTest.java
URL: 
http://svn.apache.org/viewvc/mina/mina/branches/2.0/mina-example/src/test/java/org/apache/mina/example/echoserver/ssl/SslFilterTest.java?rev=1402104&r1=1402103&r2=1402104&view=diff
==============================================================================
--- 
mina/mina/branches/2.0/mina-example/src/test/java/org/apache/mina/example/echoserver/ssl/SslFilterTest.java
 (original)
+++ 
mina/mina/branches/2.0/mina-example/src/test/java/org/apache/mina/example/echoserver/ssl/SslFilterTest.java
 Thu Oct 25 11:29:58 2012
@@ -93,7 +93,7 @@ public class SslFilterTest {
         EchoHandler handler = new EchoHandler();
         acceptor.setHandler(handler);
         acceptor.bind(new InetSocketAddress(0));
-        port = ((InetSocketAddress)acceptor.getLocalAddress()).getPort();
+        port = acceptor.getLocalAddress().getPort();
         //System.out.println("MINA server started.");
 
         Socket socket = getClientSocket(useSSL);