Merge branch 'master' of github.com:TooTallNate/Java-WebSocket

Davidiusdadi · Davidiusdadi · commit 17c74d3e6d42 · 2012-01-28T19:10:18.000+01:00
diff --git a/src/net/tootallnate/websocket/Draft.java b/src/net/tootallnate/websocket/Draft.java
@@ -67,7 +67,7 @@ public static HandshakeBuilder translateHandshakeHttp( ByteBuffer buf ) throws I
 		draft.setResourceDescriptor( firstLineTokens[ 1 ] );
 
 		line = readStringLine( buf );
-		while ( line != null && !line.isEmpty() ) {
+		while ( line != null && line.length() > 0 ) {
 			String[] pair = line.split( ":", 2 );
 			if( pair.length != 2 )
 				throw new InvalidHandshakeException( "not an http header" );
diff --git a/src/net/tootallnate/websocket/HandshakedataImpl1.java b/src/net/tootallnate/websocket/HandshakedataImpl1.java
@@ -32,7 +32,7 @@ public HandshakedataImpl1( Handshakedata h ) {
 	@Override
 	public String getResourceDescriptor() {
 		// validate resourcedescriptor
-		return resourcedescriptor == null || resourcedescriptor.isEmpty() ? "" : resourcedescriptor;
+		return resourcedescriptor == null || (resourcedescriptor.length() == 0) ? "" : resourcedescriptor;
 	}
 
 	@Override
diff --git a/src/net/tootallnate/websocket/WebSocketClient.java b/src/net/tootallnate/websocket/WebSocketClient.java
@@ -233,7 +233,7 @@ private void sendHandshake() throws IOException , InvalidHandshakeException , In
 		String path;
 		String part1 = uri.getPath();
 		String part2 = uri.getQuery();
-		if( part1 == null || part1.isEmpty() )
+		if( part1 == null || part1.length() == 0 )
 			path = "/";
 		else
 			path = part1;
diff --git a/src/net/tootallnate/websocket/drafts/Draft_10.java b/src/net/tootallnate/websocket/drafts/Draft_10.java
@@ -35,7 +35,7 @@ public int getPreferedSize() {
 
 	public static int readVersion( Handshakedata handshakedata ) {
 		String vers = handshakedata.getFieldValue( "Sec-WebSocket-Version" );
-		if( !vers.isEmpty() ) {
+		if( vers.length() > 0 ) {
 			int v;
 			try {
 				v = new Integer( vers.trim() );
diff --git a/src/net/tootallnate/websocket/drafts/Draft_76.java b/src/net/tootallnate/websocket/drafts/Draft_76.java
@@ -119,7 +119,7 @@ public HandshakeState acceptHandshakeAsClient( Handshakedata request, Handshaked
 	@Override
 	public HandshakeState acceptHandshakeAsServer( Handshakedata handshakedata ) {
 
-		if( handshakedata.getFieldValue( "Upgrade" ).equals( "WebSocket" ) && handshakedata.getFieldValue( "Connection" ).contains( "Upgrade" ) && !handshakedata.getFieldValue( "Sec-WebSocket-Key1" ).isEmpty() && !handshakedata.getFieldValue( "Sec-WebSocket-Key2" ).isEmpty() && handshakedata.hasFieldValue( "Origin" )
+		if( handshakedata.getFieldValue( "Upgrade" ).equals( "WebSocket" ) && handshakedata.getFieldValue( "Connection" ).contains( "Upgrade" ) && handshakedata.getFieldValue( "Sec-WebSocket-Key1" ).length() > 0 && !handshakedata.getFieldValue( "Sec-WebSocket-Key2" ).isEmpty() && handshakedata.hasFieldValue( "Origin" )
 		/*new String ( handshakedata.getContent () ).endsWith ( "\r\n\r\n" )*/)
 			return HandshakeState.MATCHED;
 		return HandshakeState.NOT_MATCHED;

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public HandshakedataImpl1( Handshakedata h ) {`
`32`	`32`	`@Override`
`33`	`33`	`public String getResourceDescriptor() {`
`34`	`34`	`// validate resourcedescriptor`
`35`		`- return resourcedescriptor == null \|\| resourcedescriptor.isEmpty() ? "" : resourcedescriptor;`
	`35`	`+ return resourcedescriptor == null \|\| (resourcedescriptor.length() == 0) ? "" : resourcedescriptor;`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`@Override`