summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortanghao <default@DESKTOP-7FEGRP2>2020-04-21 17:32:24 +0800
committertanghao <default@DESKTOP-7FEGRP2>2020-04-21 17:32:24 +0800
commit48f97799be63eb9dbfe5e3fed2e9dd1c18595c7f (patch)
tree9a48ef5b4c07e248106d37b70014c80c766ccf4a
parent89e357b77cab8dd121026c5a56753efb9a1ef916 (diff)
fix: 去掉无内容时不更新配置文件限制(解决用户清空job没有更新配置bug)
-rw-r--r--src/main/java/com/nis/job/ConfagentJob.java3
-rw-r--r--src/main/java/com/nis/util/YamlUtil.java2
2 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/com/nis/job/ConfagentJob.java b/src/main/java/com/nis/job/ConfagentJob.java
index 3e26b55..e72bd15 100644
--- a/src/main/java/com/nis/job/ConfagentJob.java
+++ b/src/main/java/com/nis/job/ConfagentJob.java
@@ -195,11 +195,10 @@ public class ConfagentJob extends QuartzJobBean {
}
}
}
- List result = null;
+ List result = new ArrayList();
Set<String> snmpYmls= new HashSet<String>();
//两者模运算均匀分配
if(index!=null && !endpointInfos.isEmpty()) {
- result=new ArrayList();
for(int m=0;m<endpointInfos.size();m++) {
if(m%subInfos.size()==index) {
//根据module类型来判断snmp处理
diff --git a/src/main/java/com/nis/util/YamlUtil.java b/src/main/java/com/nis/util/YamlUtil.java
index 1620040..695c489 100644
--- a/src/main/java/com/nis/util/YamlUtil.java
+++ b/src/main/java/com/nis/util/YamlUtil.java
@@ -91,7 +91,7 @@ public class YamlUtil {
@SuppressWarnings("unchecked")
public static boolean subYmlHandle(List<Object> param,String ymlPath) {
boolean flag=false;
- if(param!=null && !param.isEmpty() && ymlPath != null && ymlPath.length() != 0) {
+ if(param!=null && ymlPath != null && ymlPath.length() != 0) {
FileInputStream fileInputStream =null;
OutputStream out = null;
OutputStreamWriter osw = null;