summaryrefslogtreecommitdiffstats
path: root/jdisc_http_service
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@yahoo-inc.com>2016-11-30 19:26:23 +0100
committerBjørn Christian Seime <bjorncs@yahoo-inc.com>2016-11-30 20:49:22 +0100
commita553eb960b5185b8a982d3e77a9bd883ff78dd21 (patch)
tree15677260cc8b9bb1be695576614f163feffca020 /jdisc_http_service
parent557589154204700e25649f7dad3c6f353ad8cf8b (diff)
Remove unnecessary restriction
Diffstat (limited to 'jdisc_http_service')
-rw-r--r--jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletOutputStreamWriter.java7
1 files changed, 1 insertions, 6 deletions
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletOutputStreamWriter.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletOutputStreamWriter.java
index 5f248db9fe3..5c831a3dd65 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletOutputStreamWriter.java
+++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletOutputStreamWriter.java
@@ -42,7 +42,6 @@ public class ServletOutputStreamWriter {
private static final Logger log = Logger.getLogger(ServletOutputStreamWriter.class.getName());
- // TODO: This reference is not guaranteed to be unique; ByteBuffer.allocate(0) MAY in principle return a singleton!
// If so, application code could fake a close by writing such a byte buffer.
// The problem can be solved by filtering out zero-length byte buffers from application code.
// Other ways to express this are also possible, e.g. with a 'closed' state checked when queue goes empty.
@@ -78,10 +77,7 @@ public class ServletOutputStreamWriter {
}
public void registerWriteListener() {
- synchronized (monitor) {
- assertStateIs(state, State.NOT_STARTED);
- outputStream.setWriteListener(writeListener);
- }
+ outputStream.setWriteListener(writeListener);
}
public void sendErrorContentAndCloseAsync(ByteBuffer errorContent) {
@@ -129,7 +125,6 @@ public class ServletOutputStreamWriter {
}
if (thisThreadShouldWrite) {
- // TODO: Consider refactoring to avoid multiple monitor entry-exit.
writeBuffersInQueueToOutputStream();
}
}