From 295fb256c7d62441c99b096e8b600e621620ddf4 Mon Sep 17 00:00:00 2001
From: xuxueli <931591021@qq.com>
Date: Fri, 9 Mar 2018 12:06:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=88=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/XXL-JOB官方文档.md                                        | 1 +
 .../java/com/xxl/job/core/rpc/netcom/NetComClientProxy.java   | 3 +--
 .../com/xxl/job/core/rpc/netcom/jetty/client/JettyClient.java | 4 ++--
 .../src/main/java/com/xxl/job/core/util/HttpClientUtil.java   | 1 -
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/doc/XXL-JOB官方文档.md b/doc/XXL-JOB官方文档.md
index 3199f5e5..ed4e37d2 100644
--- a/doc/XXL-JOB官方文档.md
+++ b/doc/XXL-JOB官方文档.md
@@ -1183,6 +1183,7 @@ Tips: 历史版本(V1.3.x)目前已经Release至稳定版本, 进入维护阶段
 - 19、提供多版本执行器：不依赖容器版本、不内嵌Jetty版本（通过配置executoraddress替换jetty通讯）等；
 - 20、注册中心支持扩展，除默认基于DB之外，支持扩展接入第三方注册中心如zk、eureka等；
 - 21、依赖Core内部国际化处理；
+- 22、大数据量下任务日志分页优化，时间选择组件支持清空功能可提升速度；
 
 
 ## 七、其他
diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/rpc/netcom/NetComClientProxy.java b/xxl-job-core/src/main/java/com/xxl/job/core/rpc/netcom/NetComClientProxy.java
index b0343fc7..3d2f9bb2 100644
--- a/xxl-job-core/src/main/java/com/xxl/job/core/rpc/netcom/NetComClientProxy.java
+++ b/xxl-job-core/src/main/java/com/xxl/job/core/rpc/netcom/NetComClientProxy.java
@@ -58,8 +58,7 @@ public class NetComClientProxy implements FactoryBean<Object> {
 	                    
 	                    // valid response
 						if (response == null) {
-							logger.error(">>>>>>>>>>> xxl-rpc netty response not found.");
-							throw new Exception(">>>>>>>>>>> xxl-rpc netty response not found.");
+							throw new Exception("Network request fail, response not found.");
 						}
 	                    if (response.isError()) {
 	                        throw new RuntimeException(response.getError());
diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/rpc/netcom/jetty/client/JettyClient.java b/xxl-job-core/src/main/java/com/xxl/job/core/rpc/netcom/jetty/client/JettyClient.java
index d03a28c1..fed1e0f5 100644
--- a/xxl-job-core/src/main/java/com/xxl/job/core/rpc/netcom/jetty/client/JettyClient.java
+++ b/xxl-job-core/src/main/java/com/xxl/job/core/rpc/netcom/jetty/client/JettyClient.java
@@ -29,7 +29,7 @@ public class JettyClient {
 			byte[] responseBytes = HttpClientUtil.postRequest(reqURL, requestBytes);
 			if (responseBytes == null || responseBytes.length==0) {
 				RpcResponse rpcResponse = new RpcResponse();
-				rpcResponse.setError("RpcResponse byte[] is null");
+				rpcResponse.setError("Network request fail, RpcResponse byte[] is null");
 				return rpcResponse;
             }
 
@@ -40,7 +40,7 @@ public class JettyClient {
 			logger.error(e.getMessage(), e);
 
 			RpcResponse rpcResponse = new RpcResponse();
-			rpcResponse.setError("Client-error:" + e.getMessage());
+			rpcResponse.setError("Network request error: " + e.getMessage());
 			return rpcResponse;
 		}
 	}
diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/util/HttpClientUtil.java b/xxl-job-core/src/main/java/com/xxl/job/core/util/HttpClientUtil.java
index cbb846a8..7642475a 100644
--- a/xxl-job-core/src/main/java/com/xxl/job/core/util/HttpClientUtil.java
+++ b/xxl-job-core/src/main/java/com/xxl/job/core/util/HttpClientUtil.java
@@ -64,7 +64,6 @@ public class HttpClientUtil {
 				EntityUtils.consume(entity);
 			}
 		} catch (Exception e) {
-			logger.error(e.getMessage(), e);
 			throw e;
 		} finally {
 			httpPost.releaseConnection();