Include whole invalid status line

marci4 · marci4 · commit 05b9c253d8fe · 2017-10-25T21:56:03.000+02:00
When a InvalidHandShakeException is thrown, the whole invalid status
line should be included
diff --git a/.gitignore b/.gitignore
@@ -15,4 +15,5 @@ bin
 
 /doc
 *.xml
-.idea/.name
+.idea/.name
+*.jks
diff --git a/src/main/java/org/java_websocket/drafts/Draft.java b/src/main/java/org/java_websocket/drafts/Draft.java
@@ -119,23 +119,24 @@ public static HandshakeBuilder translateHandshakeHttp( ByteBuffer buf, Role role
 
 		if( role == Role.CLIENT ) {
 			// translating/parsing the response from the SERVER
-			if (!"HTTP/1.1".equalsIgnoreCase(firstLineTokens[0])) {
-				throw new InvalidHandshakeException( "Invalid status line received: " + firstLineTokens[0] );
-			}
 			if (!"101".equals(firstLineTokens[1])) {
-				throw new InvalidHandshakeException( "Invalid status code received: " + firstLineTokens[1] );
+				throw new InvalidHandshakeException( "Invalid status code received: " + firstLineTokens[1] + " Status line: " + line);
 			}
+			if (!"HTTP/1.1".equalsIgnoreCase(firstLineTokens[0])) {
+				throw new InvalidHandshakeException( "Invalid status line received: " + firstLineTokens[0] + " Status line: " + line);
+			}
+
 			handshake = new HandshakeImpl1Server();
 			ServerHandshakeBuilder serverhandshake = (ServerHandshakeBuilder) handshake;
 			serverhandshake.setHttpStatus( Short.parseShort( firstLineTokens[ 1 ] ) );
 			serverhandshake.setHttpStatusMessage( firstLineTokens[ 2 ] );
 		} else {
 			// translating/parsing the request from the CLIENT
 			if (!"GET".equalsIgnoreCase(firstLineTokens[0])) {
-				throw new InvalidHandshakeException( "Invalid request method received: " + firstLineTokens[0] );
+				throw new InvalidHandshakeException( "Invalid request method received: " + firstLineTokens[0] + " Status line: " + line);
 			}
 			if (!"HTTP/1.1".equalsIgnoreCase(firstLineTokens[2])) {
-				throw new InvalidHandshakeException( "Invalid status line received: " + firstLineTokens[2] );
+				throw new InvalidHandshakeException( "Invalid status line received: " + firstLineTokens[2] + " Status line: " + line);
 			}
 			ClientHandshakeBuilder clienthandshake = new HandshakeImpl1Client();
 			clienthandshake.setResourceDescriptor( firstLineTokens[ 1 ] );
