From db0f1a46cc7ed483e9be479a63627f735b149456 Mon Sep 17 00:00:00 2001 From: xinyuzhou1 Date: Wed, 1 Nov 2017 14:31:59 +0800 Subject: [PATCH 1/2] https://github.com/uavorg/uavstack/issues/51 fix variables in "system.cache" can not be used when MSCP reboot --- .../main/java/com/creditease/monitor/UAVMetaDataMgr.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/com.creditease.uav.monitorframework/src/main/java/com/creditease/monitor/UAVMetaDataMgr.java b/com.creditease.uav.monitorframework/src/main/java/com/creditease/monitor/UAVMetaDataMgr.java index 1967bf1a..ecce505f 100644 --- a/com.creditease.uav.monitorframework/src/main/java/com/creditease/monitor/UAVMetaDataMgr.java +++ b/com.creditease.uav.monitorframework/src/main/java/com/creditease/monitor/UAVMetaDataMgr.java @@ -174,7 +174,14 @@ public void loadMetaData() { for (String key : SystemMeta) { if (metaData.containsKey(key)) { - System.setProperty(key, (String) metaData.get(key)); + + String value = System.getProperty(key); + + if (StringHelper.isEmpty(value)) { + System.setProperty(key, (String) metaData.get(key)); + } + + } } if (log.isLogEnabled()) { From 28b5ffbfebd0c3be0230af9be9d12d3f89d3741e Mon Sep 17 00:00:00 2001 From: xinyuzhou1 Date: Wed, 1 Nov 2017 14:39:37 +0800 Subject: [PATCH 2/2] Modify code format --- .../com/creditease/monitor/UAVMetaDataMgr.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/com.creditease.uav.monitorframework/src/main/java/com/creditease/monitor/UAVMetaDataMgr.java b/com.creditease.uav.monitorframework/src/main/java/com/creditease/monitor/UAVMetaDataMgr.java index ecce505f..ad3ad342 100644 --- a/com.creditease.uav.monitorframework/src/main/java/com/creditease/monitor/UAVMetaDataMgr.java +++ b/com.creditease.uav.monitorframework/src/main/java/com/creditease/monitor/UAVMetaDataMgr.java @@ -174,14 +174,13 @@ public void loadMetaData() { for (String key : SystemMeta) { if (metaData.containsKey(key)) { - - String value = System.getProperty(key); - - if (StringHelper.isEmpty(value)) { - System.setProperty(key, (String) metaData.get(key)); - } - - + + String value = System.getProperty(key); + + if (StringHelper.isEmpty(value)) { + System.setProperty(key, (String) metaData.get(key)); + } + } } if (log.isLogEnabled()) {