diff options
| author | Jan Bartel | 2013-08-29 02:16:38 +0000 |
|---|---|---|
| committer | Jan Bartel | 2013-08-29 02:16:38 +0000 |
| commit | 35d379a33515ee3472c5bcab9bb77fcb4ae64510 (patch) | |
| tree | f25db1df7944c35280cf2231e0afe8c8e329eb6e | |
| parent | ef166c23e69a28c2c24e64ede929f5052293e606 (diff) | |
| download | org.eclipse.jetty.project-35d379a33515ee3472c5bcab9bb77fcb4ae64510.tar.gz org.eclipse.jetty.project-35d379a33515ee3472c5bcab9bb77fcb4ae64510.tar.xz org.eclipse.jetty.project-35d379a33515ee3472c5bcab9bb77fcb4ae64510.zip | |
416096 DefaultServlet leaves open file descriptors with file sizes greater than response buffer
| -rw-r--r-- | jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java index 22248b3ed0..d12dee756c 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java @@ -478,6 +478,7 @@ public class HttpOutput extends ServletOutputStream if (_eof) { // Handle EOF + _in.close(); closed(); _channel.getByteBufferPool().release(_buffer); return true; @@ -489,7 +490,6 @@ public class HttpOutput extends ServletOutputStream { _eof=true; len=0; - _in.close(); } else if (len<_buffer.capacity()) { @@ -552,6 +552,7 @@ public class HttpOutput extends ServletOutputStream { if (_eof) { + _in.close(); closed(); _channel.getByteBufferPool().release(_buffer); return true; @@ -563,8 +564,7 @@ public class HttpOutput extends ServletOutputStream if (len<0) { _eof=true; - len=0; - _in.close(); + len=0; } else if (len<_buffer.capacity()) { |