XD fixed fatal bug introduced during merging wss support

Davidiusdadi · Davidiusdadi · commit 684db372cbe8 · 2012-07-18T17:14:14.000+02:00
diff --git a/example/SSLServer.java b/example/SSLServer.java
@@ -2,9 +2,11 @@
 
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.IOException;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.Socket;
+import java.nio.channels.ByteChannel;
 import java.nio.channels.SocketChannel;
 import java.security.KeyStore;
 import java.util.List;
@@ -34,6 +36,7 @@ public class SSLServer implements WebSocketServer.WebSocketServerFactory
     
     public static void main(String[] args) throws Exception
     {
+		WebSocket.DEBUG = true;
 	new SSLServer();
     }
 
@@ -66,7 +69,7 @@ void loadFromFile() throws Exception
 	loadFromFile();
 	
 	// create the web socket server
-	WebSocketSource wsgateway = new WebSocketSource(8001, InetAddress.getByName("127.0.0.1"));
+		WebSocketSource wsgateway = new WebSocketSource( 8887, InetAddress.getByName( "localhost" ) );
 	wsgateway.setWebSocketFactory(this);
 	wsgateway.start();
     }
@@ -89,16 +92,12 @@ public WebSocketImpl createWebSocket( WebSocketAdapter a, List<Draft> d, Socket
     }
     
 	@Override
-	public SocketChannel wrapChannel( SocketChannel c ) {
-		if( sslContext != null )
-			try {
-				SSLEngine e = sslContext.createSSLEngine();
-				e.setUseClientMode( false );
-				new SSLSocketChannel( c, e );
-			} catch ( Exception e1 ) {
-			}
-
-		return c;
+	public ByteChannel wrapChannel( SocketChannel c ) throws IOException {
+		if( sslContext == null )
+			throw new IllegalArgumentException( "sslContext not initialized");
+		SSLEngine e = sslContext.createSSLEngine();
+		e.setUseClientMode( false );
+		return new SSLSocketChannel( c, e );
 	}
 
     class WebSocketSource extends WebSocketServer
diff --git a/src/org/java_websocket/WebSocketFactory.java b/src/org/java_websocket/WebSocketFactory.java
@@ -1,6 +1,8 @@
 package org.java_websocket;
 
+import java.io.IOException;
 import java.net.Socket;
+import java.nio.channels.ByteChannel;
 import java.nio.channels.SocketChannel;
 import java.util.List;
 
@@ -9,5 +11,5 @@
 public interface WebSocketFactory {
 	public WebSocket createWebSocket( WebSocketAdapter a, Draft d, Socket s );
 	public WebSocket createWebSocket( WebSocketAdapter a, List<Draft> drafts, Socket s );
-	public SocketChannel wrapChannel( SocketChannel c );
+	public ByteChannel wrapChannel( SocketChannel c ) throws IOException;
 }
diff --git a/src/org/java_websocket/WebSocketImpl.java b/src/org/java_websocket/WebSocketImpl.java
@@ -4,6 +4,7 @@
 import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.nio.ByteBuffer;
+import java.nio.channels.ByteChannel;
 import java.nio.channels.NotYetConnectedException;
 import java.nio.channels.SelectionKey;
 import java.util.ArrayList;
@@ -92,7 +93,7 @@ public class WebSocketImpl extends WebSocket {
 
 	public final Socket socket;
 
-	public Object ioobject;
+	public ByteChannel ioobject;
 
 	// CONSTRUCTOR /////////////////////////////////////////////////////////////
 	/**
