minor fix for 2392776

Davidiusdadi · Davidiusdadi · commit 86ebec4fb55a · 2012-03-04T21:39:47.000+01:00
diff --git a/src/org/java_websocket/WebSocket.java b/src/org/java_websocket/WebSocket.java
@@ -96,20 +96,20 @@ public enum Role {
 	/**
 	 * Used in {@link WebSocketServer} and {@link WebSocketClient}.
 	 * 
-	 * @param socketChannel
+	 * @param socketchannel
 	 *            The <tt>SocketChannel</tt> instance to read and
 	 *            write to. The channel should already be registered
 	 *            with a Selector before construction of this object.
 	 * @param listener
 	 *            The {@link WebSocketListener} to notify of events when
 	 *            they occur.
 	 */
-	public WebSocket( WebSocketListener listener , Draft draft , SocketChannel socketChannel ) {
-		init( listener, draft, socketChannel );
+	public WebSocket( WebSocketListener listener , Draft draft , SocketChannel socketchannel ) {
+		init( listener, draft, socketchannel );
 	}
 
-	public WebSocket( WebSocketListener listener , List<Draft> drafts , SocketChannel socketChannel ) {
-		init( listener, null, sockchannel );
+	public WebSocket( WebSocketListener listener , List<Draft> drafts , SocketChannel socketchannel ) {
+		init( listener, null, socketchannel );
 		this.role = Role.SERVER;
 		if( known_drafts == null || known_drafts.isEmpty() ) {
 			known_drafts = new ArrayList<Draft>( 1 );
@@ -122,8 +122,8 @@ public WebSocket( WebSocketListener listener , List<Draft> drafts , SocketChanne
 		}
 	}
 
-	private void init( WebSocketListener listener, Draft draft, SocketChannel sockchannel ) {
-		this.sockchannel = sockchannel;
+	private void init( WebSocketListener listener, Draft draft, SocketChannel socketchannel ) {
+		this.sockchannel = socketchannel;
 		this.bufferQueue = new LinkedBlockingQueue<ByteBuffer>( 10 );
 		this.socketBuffer = ByteBuffer.allocate( 65558 );
 		socketBuffer.flip();
diff --git a/src/org/java_websocket/WebSocketServer.java b/src/org/java_websocket/WebSocketServer.java
@@ -184,7 +184,7 @@ public void run() {
 					if( key.isAcceptable() ) {
 						SocketChannel client = server.accept();
 						client.configureBlocking( false );
-						WebSocket c = new WebSocket( this, Collections.singletonList( draft ), client.socket().getChannel() );
+						WebSocket c = new WebSocket( this, Collections.singletonList( draft ), client );
 						client.register( selector, SelectionKey.OP_READ, c );
 					}
 

Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ public void run() {`
`184`	`184`	`if( key.isAcceptable() ) {`
`185`	`185`	`SocketChannel client = server.accept();`
`186`	`186`	`client.configureBlocking( false );`
`187`		`- WebSocket c = new WebSocket( this, Collections.singletonList( draft ), client.socket().getChannel() );`
	`187`	`+ WebSocket c = new WebSocket( this, Collections.singletonList( draft ), client );`
`188`	`188`	`client.register( selector, SelectionKey.OP_READ, c );`
`189`	`189`	`}`
`190`	`190`