You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mb...@apache.org on 2018/08/14 19:10:31 UTC
asterixdb git commit: [NO ISSUE][OTH] Avoid NPE on response w/o
content-length
Repository: asterixdb
Updated Branches:
refs/heads/master 0b414e81e -> 1619b8881
[NO ISSUE][OTH] Avoid NPE on response w/o content-length
Change-Id: Ifac2a5098f3c70348b20b2859d5d2fdddb3d8579
Reviewed-on: https://asterix-gerrit.ics.uci.edu/2902
Reviewed-by: Murtadha Hubail <mh...@apache.org>
Tested-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/1619b888
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/1619b888
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/1619b888
Branch: refs/heads/master
Commit: 1619b8881584a6f9a197344939c118ad869f824e
Parents: 0b414e8
Author: Michael Blow <mb...@apache.org>
Authored: Tue Aug 14 12:05:54 2018 -0700
Committer: Michael Blow <mb...@apache.org>
Committed: Tue Aug 14 12:10:14 2018 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/hyracks/http/server/CLFLogger.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/1619b888/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/CLFLogger.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/CLFLogger.java b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/CLFLogger.java
index cfbcad8..70f861c 100644
--- a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/CLFLogger.java
+++ b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/CLFLogger.java
@@ -23,7 +23,6 @@ import java.time.Instant;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
-import io.netty.channel.socket.nio.NioSocketChannel;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -31,6 +30,7 @@ import org.apache.logging.log4j.Logger;
import io.netty.channel.ChannelDuplexHandler;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelPromise;
+import io.netty.channel.socket.nio.NioSocketChannel;
import io.netty.handler.codec.http.DefaultFullHttpResponse;
import io.netty.handler.codec.http.DefaultHttpContent;
import io.netty.handler.codec.http.DefaultHttpResponse;
@@ -93,7 +93,7 @@ public class CLFLogger extends ChannelDuplexHandler {
statusCode = resp.status().code();
if (msg instanceof DefaultFullHttpResponse) {
lastChunk = true;
- respSize = resp.headers().getInt(HttpHeaderNames.CONTENT_LENGTH);
+ respSize = resp.headers().getInt(HttpHeaderNames.CONTENT_LENGTH, 0);
}
} else if (msg instanceof DefaultHttpContent) {
HttpContent content = (DefaultHttpContent) msg;