Projects >> Java-WebSocket >>41e10c1e5de096301dee3445616fb5ed3aaa9fa7

Chunk
Conflicting content 
import java.nio.channels.SelectionKey;
import java.nio.channels.Selector;
import java.nio.channels.SocketChannel;
<<<<<<< HEAD
import java.nio.charset.CharacterCodingException;
=======
import java.nio.channels.UnresolvedAddressException;
>>>>>>> eec4e8f8a55c096c97f4d0805628403c098f4ad6
import java.util.Iterator;
import java.util.Set;
Solution content 
import java.nio.channels.SelectionKey;
import java.nio.channels.Selector;
import java.nio.channels.SocketChannel;
import java.nio.channels.UnresolvedAddressException;
import java.util.Iterator;
import java.util.Set;
File
WebSocketClient.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
			return;
		} catch ( IOException e ) {//
			onError( conn, e );
<<<<<<< HEAD
			conn.closeConnection( CloseFrame.ABNROMAL_CLOSE );
			return;
		} catch ( SecurityException e ) {
			onError( conn, e );
			conn.closeConnection( CloseFrame.ABNROMAL_CLOSE );
=======
			return;
		} catch ( SecurityException e ) {
			onError( conn, e );
>>>>>>> eec4e8f8a55c096c97f4d0805628403c098f4ad6
			return;
        } catch ( UnresolvedAddressException e ) {
            onError( conn, e );
Solution content 
			return;
		} catch ( IOException e ) {//
			onError( conn, e );
			return;
		} catch ( SecurityException e ) {
			onError( conn, e );
			return;
		} catch ( UnresolvedAddressException e ) {
			onError( conn, e );
			return;
File
WebSocketClient.java
Developer's decision
Combination
Kind of conflict
Catch clause
Method invocation
Return statement
Chunk
Conflicting content 
            onError( conn, e );
            return;
		}
<<<<<<< HEAD
		try/*IO*/{
			while ( !Thread.interrupted() && !conn.isClosed() ) {
				SelectionKey key = null;
				conn.flush();
=======

		conn = new WebSocket( this, draft, client );

		while ( !Thread.interrupted() ) {
			SelectionKey key = null;
			try {
				conn.handleWrite();
>>>>>>> eec4e8f8a55c096c97f4d0805628403c098f4ad6
				selector.select();
				Set keys = selector.selectedKeys();
				Iterator i = keys.iterator();
Solution content 
		}
		conn = new WebSocket( this, draft, client );
		try/*IO*/{
			while ( !Thread.interrupted() && !conn.isClosed() ) {
				SelectionKey key = null;
				conn.flush();
				selector.select();
				Set keys = selector.selectedKeys();
				Iterator i = keys.iterator();
File
WebSocketClient.java
Developer's decision
Combination
Kind of conflict
Attribute
Method invocation
Try statement
Variable
While statement