OnCommitedResponseWrapper commits when buffer exceeded

Fixes #26
spring-projects · Aug 1, 2014 · 2732a18 · 2732a18
1 parent 0d217c6
commit 2732a18
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/...ession/src/main/java/org/springframework/session/web/http/OnCommittedResponseWrapper.java b/...ession/src/main/java/org/springframework/session/web/http/OnCommittedResponseWrapper.java
@@ -187,7 +187,10 @@ private void trackContentLength(String content) {
      */
     private void checkContentLength(long contentLengthToWrite) {
         contentWritten += contentLengthToWrite;
-        if(contentLength > 0  && contentWritten >= contentLength) {
+        boolean isBodyFullyWritten = contentLength > 0  && contentWritten >= contentLength;
+        int bufferSize = getBufferSize();
+        boolean requiresFlush = bufferSize > 0 && contentWritten >= bufferSize;
+        if(isBodyFullyWritten || requiresFlush) {
             doOnResponseCommitted();
         }
     }

diff --git a/...n/src/test/java/org/springframework/session/web/http/OnCommittedResponseWrapperTests.java b/...n/src/test/java/org/springframework/session/web/http/OnCommittedResponseWrapperTests.java
@@ -1059,4 +1059,14 @@ public void addHeaderContentLengthPrintWriterWriteStringCommits() throws Excepti
 
         assertThat(committed).isTrue();
     }
+
+    @Test
+    public void bufferSizePrintWriterWriteCommits() throws Exception {
+        String expected = "1234567890";
+        when(response.getBufferSize()).thenReturn(expected.length());
+
+        response.getWriter().write(expected);
+
+        assertThat(committed).isTrue();
+    }
 }