gzip对request增加null判断

javalibrary · Jul 13, 2019 · dfe6b6e · dfe6b6e
1 parent 31479e5
commit dfe6b6e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 21 deletions.
diff --git a/src/zoo/http/common/src/main/java/org/tio/http/common/HttpResponseEncoder.java b/src/zoo/http/common/src/main/java/org/tio/http/common/HttpResponseEncoder.java
@@ -21,17 +21,11 @@
  * 2017年8月4日 上午9:41:12
  */
 public class HttpResponseEncoder {
-
-	@SuppressWarnings("unused")
-	private static Logger log = LoggerFactory.getLogger(HttpResponseEncoder.class);
-
-	public static final int MAX_HEADER_LENGTH = 20480;
-
-	public static final int HEADER_SERVER_LENGTH = HeaderName.Server.bytes.length + HeaderValue.Server.TIO.bytes.length + 3;
-
-	public static final int HEADER_DATE_LENGTH_1 = HeaderName.Date.bytes.length + 3;
-
-	public static final int HEADER_FIXED_LENGTH = HEADER_SERVER_LENGTH + HEADER_DATE_LENGTH_1;
+	private static Logger	log						= LoggerFactory.getLogger(HttpResponseEncoder.class);
+	public static final int	MAX_HEADER_LENGTH		= 20480;
+	public static final int	HEADER_SERVER_LENGTH	= HeaderName.Server.bytes.length + HeaderValue.Server.TIO.bytes.length + 3;
+	public static final int	HEADER_DATE_LENGTH_1	= HeaderName.Date.bytes.length + 3;
+	public static final int	HEADER_FIXED_LENGTH		= HEADER_SERVER_LENGTH + HEADER_DATE_LENGTH_1;
 
 	/**
 	 *
@@ -66,16 +60,14 @@ public static ByteBuffer encode(HttpResponse httpResponse, GroupContext groupCon
 			}
 		}
 
-
-
 		if (body != null) {
 			//处理gzip
 			try {
 				HttpGzipUtils.gzip(httpRequest, httpResponse);
 			} catch (Exception e) {
 				log.error(e.toString(), e);
 			}
-			
+
 			body = httpResponse.body;
 			bodyLength = body.length;
 		}

diff --git a/src/zoo/http/common/src/main/java/org/tio/http/common/utils/HttpGzipUtils.java b/src/zoo/http/common/src/main/java/org/tio/http/common/utils/HttpGzipUtils.java
@@ -26,16 +26,22 @@ public static void gzip(HttpRequest request, HttpResponse response) {
 		if (response == null) {
 			return;
 		}
-//
-//		// 已经gzip过了，就不必再压缩了
-//		if (response.isHasGzipped()) {
-//			return;
-//		}
 
-		if (request.getIsSupportGzip()) {
+		//
+		//		// 已经gzip过了，就不必再压缩了
+		//		if (response.isHasGzipped()) {
+		//			return;
+		//		}
+
+		if (request != null && request.getIsSupportGzip()) {
 			gzip(response);
 		} else {
-			log.warn("{}, 不支持gzip, {}", request.getClientIp(), request.getHeader(HttpConst.RequestHeaderKey.User_Agent));
+			if (request != null) {
+				log.warn("{}, 不支持gzip, {}", request.getClientIp(), request.getHeader(HttpConst.RequestHeaderKey.User_Agent));
+			} else {
+				log.info("request对象为空");
+			}
+
 		}
 	}