Processed remarks made by Fried Hoeben.

And some indentation.

src/fitnesse/FitNesseServer.java

@@ -2,6 +2,7 @@
 // Released under the terms of the CPL Common Public License version 1.0.
 package fitnesse;
 
+import java.io.IOException;
 import java.net.Socket;
 import java.util.concurrent.ExecutorService;
 import java.util.logging.Level;
@@ -21,17 +22,12 @@ public FitNesseServer(FitNesseContext context, ExecutorService executorService)
   }
 
   @Override
-  public void serve(Socket s) {
+  public void serve(Socket s) throws IOException {
     serve(s, 10000);
   }
 
-  public void serve(Socket s, long requestTimeout) {
-    try {
-      FitNesseExpediter sender = new FitNesseExpediter(s, context, executorService, requestTimeout);
-      executorService.submit(sender);
-    }
-    catch (Exception e) {
-      LOG.log(Level.SEVERE, "Error while serving socket " + s, e);
-    }
+  public void serve(Socket s, long requestTimeout) throws IOException {
+    FitNesseExpediter sender = new FitNesseExpediter(s, context, executorService, requestTimeout);
+    executorService.submit(sender);
   }
 }

src/fitnesse/responders/ErrorResponder.java

@@ -2,6 +2,8 @@
 // Released under the terms of the CPL Common Public License version 1.0.
 package fitnesse.responders;
 
+import java.io.UnsupportedEncodingException;
+
 import fitnesse.FitNesseContext;
 import fitnesse.Responder;
 import fitnesse.http.Request;
@@ -48,7 +50,7 @@ public static String makeExceptionString(Throwable e) {
     StringBuilder buffer = new StringBuilder();
     buffer.append(e.toString()).append("\n");
     for (StackTraceElement stackTraceElement : e.getStackTrace()) {
-      buffer.append("\t" + stackTraceElement).append("\n");
+      buffer.append("\t").append(stackTraceElement).append("\n");
     }
 
     return buffer.toString();

src/fitnesse/socketservice/SocketService.java

@@ -69,7 +69,7 @@ private void serviceThread() {
         LOG.log(Level.SEVERE, "Can't create new thread.  Out of Memory.  Aborting.", e);
         System.exit(99);
       } catch (SocketException sox) {
-        running = false; // do nothing
+        running = false;
       } catch (IOException e) {
         LOG.log(Level.SEVERE, "I/O exception in service thread", e);
       }

src/fitnesse/testsystems/fit/FitTestSystem.java

@@ -50,6 +50,7 @@ public void runTests(TestPage pageToTest) throws TestExecutionException {
       else
         client.send(html);
     } catch (InterruptedException e) {
+      Thread.currentThread().interrupt();
       exceptionOccurred(e);
       throw new TestExecutionException("Testing has been interrupted", e);
     } catch (IOException e) {
@@ -101,8 +102,11 @@ public void testComplete(TestSummary testSummary) {
 
   @Override
   public void exceptionOccurred(Throwable t) {
-    client.kill();
-    testSystemStopped(t);
+    try {
+      client.kill();
+    } finally {
+      testSystemStopped(t);
+    }
   }
 
   private void testSystemStarted(TestSystem testSystem) {

src/fitnesse/testsystems/slim/tables/DecisionTable.java

@@ -35,14 +35,14 @@ public List<SlimAssertion> getAssertions() throws TestExecutionException {
     ScenarioTable scenario = getTestContext().getScenario(scenarioName);
     if (scenario != null) {
       return new ScenarioCaller().call(scenario);
-    } else{
+    } else {
     	scenarioName =getFixtureName();
     	scenario = getTestContext().getScenario(scenarioName);
-        if (scenario != null) {
-            return new ScenarioCallerWithConstuctorParameters().call(scenario);
-        }else{
-        	return new FixtureCaller().call(getFixtureName());
-        }
+      if (scenario != null) {
+        return new ScenarioCallerWithConstuctorParameters().call(scenario);
+      } else {
+        return new FixtureCaller().call(getFixtureName());
+      }
     }
   }
 

src/fitnesse/testsystems/slim/tables/SlimTable.java

@@ -125,10 +125,10 @@ public void setFixtureName(String name){
   }
 
   protected String getFixtureName() {
-	if (fixtureName == null){
+	  if (fixtureName == null) {
       String tableHeader = table.getCellContents(0, 0);
       fixtureName = getFixtureName(tableHeader);
-	}
+	  }
     return Disgracer.disgraceClassName(fixtureName);
   }
 
@@ -417,30 +417,31 @@ class ReturnedSymbolExpectation extends ReturnedValueExpectation {
 	  private String symbolName;
 	  private String assignToName = null;
 	  public ReturnedSymbolExpectation(int col, int row, String symbolName) {
-	      super(col, row);
+      super(col, row);
 		  this.symbolName = symbolName;
-	    }
-	  public ReturnedSymbolExpectation(int col, int row, String symbolName, String assignToName) {
-	      super(col, row);
+    }
+
+    public ReturnedSymbolExpectation(int col, int row, String symbolName, String assignToName) {
+      super(col, row);
 		  this.symbolName = symbolName;
 		  this.assignToName = assignToName;
-	    }
-
-	    @Override
-	    public TestResult evaluateExpectation(Object returnValue) {
-        String value = getSymbol(this.symbolName);
-	      return super.evaluateExpectation(value);
-	    }
-
-	    @Override
-	    protected SlimTestResult createEvaluationMessage(String actual, String expected) {
-	      if (assignToName != null){
-	        setSymbol(assignToName, actual);
-	        return SlimTestResult.plain(String.format("$%s<-[%s]", assignToName, actual));
-	      }else{
-	    	  return super.createEvaluationMessage(actual, expected);
-	      }
-	    }
+    }
+
+    @Override
+    public TestResult evaluateExpectation(Object returnValue) {
+      String value = getSymbol(this.symbolName);
+      return super.evaluateExpectation(value);
+    }
+
+    @Override
+    protected SlimTestResult createEvaluationMessage(String actual, String expected) {
+      if (assignToName != null) {
+        setSymbol(assignToName, actual);
+        return SlimTestResult.plain(String.format("$%s<-[%s]", assignToName, actual));
+      }else{
+        return super.createEvaluationMessage(actual, expected);
+      }
+    }
   }
 
   class RejectedValueExpectation extends ReturnedValueExpectation {