From 7c26b4a9b6ac94d95a0be8ceb4c68298910b9053 Mon Sep 17 00:00:00 2001
From: "xueli.xue" <xueli.xue@dianping.com>
Date: Fri, 24 Feb 2017 19:46:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0RM?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/core/callback/XxlJobLogCallbackServerHandler.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/callback/XxlJobLogCallbackServerHandler.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/callback/XxlJobLogCallbackServerHandler.java
index af388eae..0f8d9f2d 100644
--- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/callback/XxlJobLogCallbackServerHandler.java
+++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/callback/XxlJobLogCallbackServerHandler.java
@@ -103,7 +103,9 @@ public class XxlJobLogCallbackServerHandler extends AbstractHandler {
 
 		// handle msg
 		StringBuffer handleMsg = new StringBuffer();
-		handleMsg.append("执行备注：").append(requestModel.getMsg());
+        if (requestModel.getMsg() != null) {
+            handleMsg.append("执行备注：").append(requestModel.getMsg());
+        }
 		if (childTriggerMsg !=null) {
 			handleMsg.append("<br>子任务触发备注：").append(childTriggerMsg);
 		}
-- 
GitLab