Repository: asterixdb Updated Branches: refs/heads/master 1f56cca69 -> 34b3577c5
[NO ISSUE][OTR] More Descriptive Method Name - user model changes: no - storage format changes: no - interface changes: no Details: - Use more description method name for channel writability changes in ChunkedNettyOutputStream. Change-Id: Ie231e16cbd78e8f4cee8ea994478c66e1146401f Reviewed-on: https://asterix-gerrit.ics.uci.edu/2601 Sonar-Qube: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Reviewed-by: Murtadha Hubail <mhub...@apache.org> Tested-by: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Contrib: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Integration-Tests: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Reviewed-by: Michael Blow <mb...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/34b3577c Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/34b3577c Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/34b3577c Branch: refs/heads/master Commit: 34b3577c5ab16a7d54fc358619daa4be40806626 Parents: 1f56cca Author: Murtadha Hubail <mhub...@apache.org> Authored: Mon Apr 16 05:16:35 2018 +0300 Committer: Murtadha Hubail <mhub...@apache.org> Committed: Mon Apr 16 11:02:52 2018 -0700 ---------------------------------------------------------------------- .../apache/hyracks/http/server/ChunkedNettyOutputStream.java | 6 +++--- .../java/org/apache/hyracks/http/server/ChunkedResponse.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/34b3577c/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/ChunkedNettyOutputStream.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/ChunkedNettyOutputStream.java b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/ChunkedNettyOutputStream.java index d4f1b3d..891cc2a 100644 --- a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/ChunkedNettyOutputStream.java +++ b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/ChunkedNettyOutputStream.java @@ -105,7 +105,7 @@ public class ChunkedNettyOutputStream extends OutputStream { response.beforeFlush(); DefaultHttpContent content = new DefaultHttpContent(buffer); ctx.writeAndFlush(content, ctx.channel().voidPromise()); - // The responisbility of releasing the buffer is now with the netty pipeline since it is forwarded + // The responsibility of releasing the buffer is now with the netty pipeline since it is forwarded // within the http content. We must nullify buffer before we allocate the next one to avoid // releasing the buffer twice in case the allocation call fails. buffer = null; @@ -128,13 +128,13 @@ public class ChunkedNettyOutputStream extends OutputStream { wait(); } catch (InterruptedException e) { Thread.currentThread().interrupt(); - LOGGER.log(Level.WARN, "Interupted while waiting for channel to be writable", e); + LOGGER.log(Level.WARN, "Interrupted while waiting for channel to be writable", e); throw new IOException(e); } } } - public synchronized void resume() { + public synchronized void channelWritabilityChanged() { notifyAll(); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/asterixdb/blob/34b3577c/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/ChunkedResponse.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/ChunkedResponse.java b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/ChunkedResponse.java index 5a43d25..cd746b1 100644 --- a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/ChunkedResponse.java +++ b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/ChunkedResponse.java @@ -185,11 +185,11 @@ public class ChunkedResponse implements IServletResponse { @Override public void notifyChannelWritable() { - outputStream.resume(); + outputStream.channelWritabilityChanged(); } @Override public void notifyChannelInactive() { - outputStream.resume(); + outputStream.channelWritabilityChanged(); } }
