jeena/datakom-labb
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

fixed bug where it crashed when the request was empty

Browse source
This commit is contained in:
Jeena Paradies 2010-11-04 15:46:51 +01:00
parent a502b59e7c
commit 026902fa86
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
WebServer.java
View file

@ -124,9 +124,9 @@ final class HttpRequest implements Runnable
// Close streams and sockets // Close streams and sockets
try { try {
br.close();
outs.close(); outs.close();
socket.close(); socket.close();
br.close();
} catch (Exception e3) { } catch (Exception e3) {
@ -142,7 +142,12 @@ final class HttpRequest implements Runnable
{ {
// Get the request line of the HTTP request // Get the request line of the HTTP request
String requestLine = br.readLine(); String requestLine = br.readLine();
if (requestLine == null) {
WebServer.errLog("Request is empty");
return;
}
// Display the request line // Display the request line
WebServer.log("[Request] " + requestLine); WebServer.log("[Request] " + requestLine);
@ -150,7 +155,7 @@ final class HttpRequest implements Runnable
String[] tokens = requestLine.split(" "); String[] tokens = requestLine.split(" ");
String Request = tokens[0]; String Request = tokens[0];
if(tokens.length != 3) { if(tokens.length != 3 || tokens[0].length() == 0 || tokens[1].length() == 0 || tokens[2].length() == 0) {
WebServer.errLog("Wrong number of arguments in request!"); WebServer.errLog("Wrong number of arguments in request!");