diff --git a/a4_stub/WebServer.java b/a4_stub/WebServer.java index bdbc35df21bb9988460f279c24af2f87f12a69b0..7bd4e766fe4dcb6e69dfb72c8ef9095a4fee8018 100644 --- a/a4_stub/WebServer.java +++ b/a4_stub/WebServer.java @@ -69,10 +69,6 @@ public final class WebServer { session = 0; - - - - while (true) { // TODO Accept client request. Socket clientSocket = welcomeSocket.accept(); @@ -113,9 +109,8 @@ public final class WebServer { throws Exception { // TODO Process request and header lines. String request = processHeaderLines(br, bw); - - - + if(request == null) + return; String cookieLines = null; @@ -130,15 +125,10 @@ public final class WebServer { Integer.toString(curPlayer); content += Integer.toString(curPlayer); curPlayer++; + System.out.println("\n new player\n"); } else { content += Integer.toString(playerCookie); } - if(curPlayer == 2) - System.out.println("\n Goooooo\n"); - - - - content += ".<BR>Es darf reihum ein Buchstabe geraten werden.<BR>Die Seite lädt automatisch neu.<BR>" @@ -149,6 +139,7 @@ public final class WebServer { if (curPlayer == NUM_PLAYERS) { + System.out.println("\n Goooooo\n"); gameStarted = true; curPlayer = 0; } @@ -168,6 +159,8 @@ public final class WebServer { throws Exception { // TODO Process request and header lines. String requestLine = processHeaderLines(br, bw); + if(requestLine == null) + return; requestLine = requestLine.replace("/?", ""); requestLine = requestLine.replace(" ", "="); String[] requestLineArray = requestLine.split("="); @@ -259,8 +252,8 @@ public final class WebServer { throws Exception { // TODO Process request and header lines. String requestLine = processHeaderLines(br, bw); - - + if(requestLine == null) + return; String content = "<HTML><HEAD><TITLE>Hangman</TITLE></HEAD><BODY>" @@ -270,10 +263,6 @@ public final class WebServer { // TODO Add success/fail line with solution word. - - - - content += "</BODY></HTML>"; ++curPlayer; @@ -329,20 +318,14 @@ public final class WebServer { // TODO Step through all remaining header lines and extract cookies if // present (yamyam). Optionally print the header lines to the console. String r; - while((r = br.readLine()) != null) { + while(!(r = br.readLine()).isEmpty()) { System.out.println(r); - //request += r; - if(r.isEmpty()) - break; if(r.startsWith("Cookie")) { r = r.replace(",", ""); String[] cookieArray = r.split(" "); sessionCookie = Integer.parseInt(cookieArray[1].split("=")[1]); playerCookie = Integer.parseInt(cookieArray[2].split("=")[1]); - /* if(playerCookie != -1) - curPlayer++; */ } - }