KristianRosenvold: Avoid flushing empty buffers since that makes it h…

…ard to write error on exception

r16448

java/server/src/org/openqa/grid/internal/TestSession.java

@@ -218,7 +218,6 @@ public String forward(SeleniumBasedRequest request, HttpServletResponse response
       HttpRequest proxyRequest = prepareProxyRequest(request/*, config*/);
 
       HttpResponse proxyResponse = sendRequestToNode(proxyRequest);
-
       lastActivity = timeSource.currentTimeInMillis();
 
       final int statusCode = proxyResponse.getStatusLine().getStatusCode();
@@ -265,11 +264,10 @@ public String forward(SeleniumBasedRequest request, HttpServletResponse response
         wrappedResponse.setForwardedContent(contentBeingForwarded);
         ((CommandListener) slot.getProxy()).afterCommand(this, request, wrappedResponse);
       }
+      response.flushBuffer();
       return res;
     } finally {
       forwardingRequest = false;
-      // Flushing the buffer is important to avoid concurrency problems
-      response.flushBuffer();
       Thread.currentThread().setName(currentThreadName);
     }
   }