commit 272e144e78ef5f3416daf77ece11a0e66f2b2f10
author Eric Anderson <ejona@google.com> Sat Aug 17 18:00:40 2013 -0700
committer Eric Anderson <ejona@google.com> Wed Aug 21 08:33:27 2013 -0700
tree 4133bb933265b43aba5d7fadfee5e916492895ba
parent b8449bb3b740c630bc8664aea468d7688675e0bc

Send headers during getOutputStream()

This removes some residue left by content transforms. Sending headers
during getOutputStream() was the original intention, but was swapped
away from to have consistency between transform and non-transform paths.

Now-a-days, with our watchdog and lack of content transforms, sending
headers earlier is helpful because there is considerably more time to
send content than to send headers.

src/com/google/enterprise/adaptor/DocumentHandler.java

diff --git a/src/com/google/enterprise/adaptor/DocumentHandler.java b/src/com/google/enterprise/adaptor/DocumentHandler.java
index 499e44e..68fe8dd 100644
--- a/src/com/google/enterprise/adaptor/DocumentHandler.java
+++ b/src/com/google/enterprise/adaptor/DocumentHandler.java
@@ -566,7 +566,7 @@
     }
 
     @Override
-    public OutputStream getOutputStream() {
+    public OutputStream getOutputStream() throws IOException {
       switch (state) {
         case SETUP:
           // We will need to make an OutputStream.
@@ -583,11 +583,17 @@
           throw new IllegalStateException("Already responded");
       }
       if ("HEAD".equals(ex.getRequestMethod())) {
+        // Unfortunately, we won't be able to report any errors after this
+        // point. We don't delay sending the headers, however, because of the
+        // watchdog.
         state = State.HEAD;
+        startSending(false);
         os = new SinkOutputStream();
       } else {
         state = State.SEND_BODY;
-        countingOs = new CountingOutputStream(new LazyContentOutputStream());
+        startSending(true);
+        countingOs = new CountingOutputStream(new CloseNotifyOutputStream(
+            ex.getResponseBody()));
         os = countingOs;
       }
       return os;
@@ -722,8 +728,7 @@
             // In particular, it is possible the adaptor called getOutputStream,
             // but didn't write out to the stream (consider an empty document
             // and some code choosing to never call write because all the bytes
-            // were written). In using the OutputStream provided to the Adaptor
-            // for flush()ing we also trigger a call to startSending().
+            // were written).
             os.flush();
             os.close();
           }
@@ -735,7 +740,6 @@
           break;
 
         case HEAD:
-          startSending(false);
           break;
 
         default:
@@ -875,14 +879,9 @@
       contentType = params.get("Content-Type");
     }
 
-    /**
-     * Used when transform pipeline is circumvented.
-     */
-    private class LazyContentOutputStream extends AbstractLazyOutputStream {
-      @Override
-      protected OutputStream retrieveOs() throws IOException {
-        startSending(true);
-        return ex.getResponseBody();
+    private class CloseNotifyOutputStream extends FastFilterOutputStream {
+      public CloseNotifyOutputStream(OutputStream os) {
+        super(os);
       }
 
       @Override