|
|
@@ -65,8 +65,10 @@ public class WheelTimerTask implements TimerTask {
|
|
|
if (value.startsWith("^_^")) {
|
|
|
value = value.replaceAll("\\^_\\^", "");
|
|
|
Configmap param = configmap.get(value);
|
|
|
- value = (String) param.getValue();
|
|
|
- jsonObject.addProperty(entry.getKey(), value);
|
|
|
+ if (param != null) {
|
|
|
+ value = (String) param.getValue();
|
|
|
+ jsonObject.addProperty(entry.getKey(), value);
|
|
|
+ }
|
|
|
}
|
|
|
} else {
|
|
|
jsonObject.add(entry.getKey(), replaceSpecialValue(entry.getValue(), configmap));
|
|
|
@@ -82,8 +84,10 @@ public class WheelTimerTask implements TimerTask {
|
|
|
if (value.startsWith("^_^")) {
|
|
|
value = value.replaceAll("\\^_\\^", "");
|
|
|
Configmap param = configmap.get(value);
|
|
|
- value = (String) param.getValue();
|
|
|
- jsonArray.set(i, new JsonPrimitive(value));
|
|
|
+ if (param != null) {
|
|
|
+ value = (String) param.getValue();
|
|
|
+ jsonArray.set(i, new JsonPrimitive(value));
|
|
|
+ }
|
|
|
}
|
|
|
} else {
|
|
|
jsonArray.set(i, replaceSpecialValue(element, configmap));
|