From: sunil unnava <su622b@att.com>
Date: Thu, 25 Jul 2019 14:21:23 +0000 (+0000)
Subject: Merge "FINAL unit test covergae commit"
X-Git-Tag: 2.1.3~17
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=dmaap%2Fdatarouter.git;a=commitdiff_plain;h=b10c179229cea56e36a2fb9b6f2c17baf0d83f13

Merge "FINAL unit test covergae commit"
---

b10c179229cea56e36a2fb9b6f2c17baf0d83f13
diff --cc datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeConfigManager.java
index be77d244,00922e0a..15672eee
--- a/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeConfigManager.java
+++ b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeConfigManager.java
@@@ -140,9 -144,9 +144,9 @@@ public class NodeConfigManager implemen
          } catch (Exception e) {
              NodeUtils.setIpAndFqdnForEelf(NODE_CONFIG_MANAGER);
              eelfLogger.error(EelfMsgs.MESSAGE_BAD_PROV_URL, e, provurl);
-             System.exit(1);
+             exit(1);
          }
 -        eelfLogger.info("NODE0303 Provisioning server is " + provhost);
 +        eelfLogger.debug("NODE0303 Provisioning server is " + provhost);
          eventlogurl = drNodeProperties.getProperty("LogUploadURL", "https://feeds-drtr.web.att.com/internal/logs");
          provcheck = new IsFrom(provhost);
          gfport = Integer.parseInt(drNodeProperties.getProperty("IntHttpPort", "8080"));
@@@ -181,9 -187,9 +187,9 @@@
              NodeUtils.setIpAndFqdnForEelf(NODE_CONFIG_MANAGER);
              eelfLogger.error(EelfMsgs.MESSAGE_KEYSTORE_FETCH_ERROR, ksfile);
              eelfLogger.error("NODE0309 Unable to fetch canonical name from keystore file " + ksfile);
-             System.exit(1);
+             exit(1);
          }
 -        eelfLogger.info("NODE0304 My certificate says my name is " + myname);
 +        eelfLogger.debug("NODE0304 My certificate says my name is " + myname);
          pid = new PublishId(myname);
          long minrsinterval = Long.parseLong(drNodeProperties.getProperty("MinRedirSaveInterval", "10000"));
          long minpfinterval = Long.parseLong(drNodeProperties.getProperty("MinProvFetchInterval", "10000"));