From 45be44fb95325305373647231ef74e72d1501f8c Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Sat, 11 Nov 2017 08:08:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/monitor/listener/TaskListener.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/monitor/listener/TaskListener.java b/src/main/java/com/moral/monitor/listener/TaskListener.java
index f325e1c..93462e8 100644
--- a/src/main/java/com/moral/monitor/listener/TaskListener.java
+++ b/src/main/java/com/moral/monitor/listener/TaskListener.java
@@ -73,7 +73,7 @@
}
//���������������������������map
Map<String, Float> adjustMap = redisService.getAdjustsByMac(mac);
- if(!adjustMap.isEmpty()) {
+ if(adjustMap!=null&&!adjustMap.isEmpty()) {
for (Map.Entry<String, Float> entry : adjustMap.entrySet()) {
String key = entry.getKey();
if(msgData.containsKey(key)) {
@@ -83,7 +83,6 @@
}
}
}
-
// System.out.println(message);
// System.out.println(JSON.toJSONString(msgData));
--
Gitblit v1.8.0