improved WebSocketClient: made member initialization more comprehensible

Author: Davidiusdadi

src/main/java/org/java_websocket/WebSocketImpl.java

@@ -58,8 +58,8 @@ public class WebSocketImpl implements WebSocket {
 
 	public SelectionKey key;
 
-	private final InetSocketAddress localSocketAddress;
-	private final InetSocketAddress remoteSocketAddress;
+	private final Socket socket;
+
 	/** the possibly wrapped channel object whose selection is controlled by {@link #key} */
 	public ByteChannel channel;
 	/**
@@ -120,24 +120,21 @@ public WebSocketImpl( WebSocketListener listener , List<Draft> drafts , Socket s
 
 	/**
 	 * crates a websocket with client role
+	 * 
+	 * @param sock
+	 *            may be unbound
 	 */
 	public WebSocketImpl( WebSocketListener listener , Draft draft , Socket sock ) {
 		if( listener == null || sock == null || ( draft == null && role == Role.SERVER ) )
 			throw new IllegalArgumentException( "parameters must not be null" );
-		if( !sock.isBound() ) {
-			throw new IllegalArgumentException( "socket has to be bound" );
-		}
 		this.outQueue = new LinkedBlockingQueue<ByteBuffer>();
 		inQueue = new LinkedBlockingQueue<ByteBuffer>();
 		this.wsl = listener;
 		this.role = Role.CLIENT;
 		if( draft != null )
 			this.draft = draft.copyInstance();
 
-		localSocketAddress = (InetSocketAddress) sock.getLocalSocketAddress();
-		remoteSocketAddress = (InetSocketAddress) sock.getRemoteSocketAddress();
-		assert ( localSocketAddress != null );
-		assert ( remoteSocketAddress != null );
+		socket = sock;
 	}
 
 	/**
@@ -691,12 +688,12 @@ public String toString() {
 
 	@Override
 	public InetSocketAddress getRemoteSocketAddress() {
-		return remoteSocketAddress;
+		return (InetSocketAddress) socket.getRemoteSocketAddress();
 	}
 
 	@Override
 	public InetSocketAddress getLocalSocketAddress() {
-		return localSocketAddress;
+		return (InetSocketAddress) socket.getLocalSocketAddress();
 	}
 
 	@Override

src/main/java/org/java_websocket/client/WebSocketClient.java

@@ -114,6 +114,15 @@ public WebSocketClient( URI serverUri , Draft draft , Map<String,String> headers
 		this.headers = headers;
 		this.timeout = connecttimeout;
 
+		try {
+			channel = SelectorProvider.provider().openSocketChannel();
+			channel.configureBlocking( true );
+			conn = (WebSocketImpl) wf.createWebSocket( this, draft, channel.socket() );
+		} catch ( IOException e ) {
+			onWebsocketError( null, e );
+			conn.closeConnection( CloseFrame.NEVER_CONNECTED, e.getMessage() );
+			return;
+		}
 	}
 
 	/**
@@ -153,7 +162,7 @@ public boolean connectBlocking() throws InterruptedException {
 	}
 
 	public void close() {
-		if( writethread != null && conn != null ) {
+		if( writethread != null ) {
 			conn.close( CloseFrame.NORMAL );
 		}
 	}
@@ -170,9 +179,7 @@ public void closeBlocking() throws InterruptedException {
 	 *            The String to send to the WebSocket server.
 	 */
 	public void send( String text ) throws NotYetConnectedException {
-		if( conn != null ) {
-			conn.send( text );
-		}
+		conn.send( text );
 	}
 
 	/**
@@ -182,14 +189,11 @@ public void send( String text ) throws NotYetConnectedException {
 	 *            The Byte-Array of data to send to the WebSocket server.
 	 */
 	public void send( byte[] data ) throws NotYetConnectedException {
-		if( conn != null ) {
 			conn.send( data );
-		}
 	}
 
 	private void tryToConnect( InetSocketAddress remote ) throws IOException , InvalidHandshakeException {
-		channel = SelectorProvider.provider().openSocketChannel();
-		channel.configureBlocking( true );
+
 		channel.connect( remote );
 
 	}
@@ -209,7 +213,6 @@ private final void interruptableRun() {
 			String host = uri.getHost();
 			int port = getPort();
 			tryToConnect( new InetSocketAddress( host, port ) );
-			conn = (WebSocketImpl) wf.createWebSocket( this, draft, channel.socket() );
 			conn.channel = wrappedchannel = wf.wrapChannel( channel, null, host, port );
 			timeout = 0; // since connect is over
 			sendHandshake();
@@ -298,9 +301,6 @@ private void sendHandshake() throws InvalidHandshakeException {
 	 * You can use this method instead of
 	 */
 	public READYSTATE getReadyState() {
-		if( conn == null ) {
-			return READYSTATE.NOT_YET_CONNECTED;
-		}
 		return conn.getReadyState();
 	}
 
@@ -410,7 +410,7 @@ public void run() {
 			} catch ( IOException e ) {
 				conn.eot();
 			} catch ( InterruptedException e ) {
-				// this thread is regulary terminated via an interrupt
+				// this thread is regularly terminated via an interrupt
 			}
 		}
 	}