start of new file

[IRC.git] / Robust / src / Benchmarks / WebServerJava / WebServerThread.java

diff --git a/Robust/src/Benchmarks/WebServerJava/WebServerThread.java b/Robust/src/Benchmarks/WebServerJava/WebServerThread.java
index cc9da103d375e046ca4219e45bc64db3db59941f..53782b5ac68e9dc47294ccc31eb2a067e11ed729 100644 (file)
--- a/Robust/src/Benchmarks/WebServerJava/WebServerThread.java
+++ b/Robust/src/Benchmarks/WebServerJava/WebServerThread.java
@@ -15,7 +15,7 @@ public class WebServerThread extends Thread {
        this.inventorylist=inventory;
     }
     
-    public void start() {
+    public void run() {
        // Process the incoming http request 
        while (!clientrequest()) {
        }
@@ -91,8 +91,7 @@ public class WebServerThread extends Thread {
        } else if (op == 2) { /* Inventory */
            //          System.printString("DEBUG > Calling inventory transaction\n");
            httpresponse();
-           String towrite = inventorylist.inventory(); 
-           sock.write(towrite.getBytes());
+           inventorylist.inventory(sock);      
        } else { /* Error */ 
            //          System.printString("T > Error - Unknown transaction\n");
        }
@@ -161,7 +160,7 @@ public class WebServerThread extends Thread {
            int index = prefix.indexOf('/');//Parse the GET client request to find filename
            int end = prefix.indexOf('H');
            filename = prefix.subString((index+1), (end-1));
-           System.printString("\n");
+           //      System.printString("\n");
            return true;
        }
        return false;
@@ -190,15 +189,13 @@ public class WebServerThread extends Thread {
            int i1 = s.indexOf('_');
            parsed[0] = new String(s.subString(0,i1));
            
-           String s1 = s.subString(i1+1);
-           int i2 = s1.indexOf('_');
-           parsed[1] = new String(s1.subString(0,i2));
+           int i2 = s.indexOf('_',i1+1);
+           parsed[1] = new String(s.subString(i1+1,i2));
            
-           String s2 = s1.subString(i2+1);
-           int i3 = s2.indexOf('_');
-           parsed[2] = new String(s2.subString(0,i3));
+           int i3 = s.indexOf('_',i2+1);
+           parsed[2] = new String(s.subString(i2+1,i3));
            
-           String s3 = s2.subString(i3+1);
+           String s3 = s.subString(i3+1);
            parsed[3] = s3;
            
            return 0;
@@ -209,11 +206,10 @@ public class WebServerThread extends Thread {
            int i1 = s.indexOf('_');
            parsed[0] = s.subString(0,i1);
            
-           String s1 = s.subString(i1+1);
-           int i2 = s1.indexOf('_');
-           parsed[1] = s1.subString(0,i2);
+           int i2 = s.indexOf('_', i1+1);
+           parsed[1] = s.subString(i1+1,i2);
            
-           String s2 = s1.subString(i2+1);
+           String s2 = s.subString(i2+1);
            parsed[2] = s2;
            
            parsed[3] = "";