1 files changed, 24 insertions, 14 deletions
diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/ProvRunner.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/ProvRunner.java
index 8a0ef448..747530ab 100644
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/ProvRunner.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/ProvRunner.java
@@ -73,12 +73,12 @@ import org.onap.dmaap.datarouter.provisioning.utils.SynchronizerTask;
  */
 public class ProvRunner {
 
-    public static final EELFLogger intlogger = EELFManager.getInstance()
-                                                       .getLogger("org.onap.dmaap.datarouter.provisioning.internal");
+    public static final EELFLogger intlogger = EELFManager.getInstance().getLogger("org.onap.dmaap.datarouter.provisioning.internal");
 
     private static Server provServer;
     private static AafPropsUtils aafPropsUtils;
     private static Properties provProperties;
+    private static Boolean tlsEnabled;
 
     /**
      * Starts the Data Router Provisioning server.
@@ -91,14 +91,16 @@ public class ProvRunner {
             intlogger.error("Data Router Provisioning database init failure. Exiting.");
             exit(1);
         }
-        // Set up AAF properties
-        try {
-            aafPropsUtils = new AafPropsUtils(new File(getProvProperties().getProperty(
-                "org.onap.dmaap.datarouter.provserver.aafprops.path",
-                "/opt/app/osaaf/local/org.onap.dmaap-dr.props")));
-        } catch (IOException e) {
-            intlogger.error("NODE0314 Failed to load AAF props. Exiting", e);
-            exit(1);
+        if (Boolean.TRUE.equals(getTlsEnabled())) {
+            // Set up AAF properties
+            try {
+                aafPropsUtils = new AafPropsUtils(new File(getProvProperties().getProperty(
+                    "org.onap.dmaap.datarouter.provserver.aafprops.path",
+                    "/opt/app/osaaf/local/org.onap.dmaap-dr.props")));
+            } catch (IOException e) {
+                intlogger.error("NODE0314 Failed to load AAF props. Exiting", e);
+                exit(1);
+            }
         }
         // Daemon to clean up the log directory on a daily basis
         Timer rolex = new Timer();
@@ -138,11 +140,11 @@ public class ProvRunner {
 
     public static Properties getProvProperties() {
         if (provProperties == null) {
-            try {
+            try (FileInputStream props = new FileInputStream(getProperty(
+                "org.onap.dmaap.datarouter.provserver.properties",
+                "/opt/app/datartr/etc/provserver.properties"))) {
                 provProperties = new Properties();
-                provProperties.load(new FileInputStream(getProperty(
-                    "org.onap.dmaap.datarouter.provserver.properties",
-                    "/opt/app/datartr/etc/provserver.properties")));
+                provProperties.load(props);
             } catch (IOException e) {
                 intlogger.error("Failed to load PROV properties: " + e.getMessage(), e);
                 exit(1);
@@ -154,4 +156,12 @@ public class ProvRunner {
     public static AafPropsUtils getAafPropsUtils() {
         return aafPropsUtils;
     }
+
+    public static Boolean getTlsEnabled() {
+        if (tlsEnabled == null) {
+            tlsEnabled = Boolean.parseBoolean(getProvProperties()
+                .getProperty("org.onap.dmaap.datarouter.provserver.tlsenabled", "true"));
+        }
+        return tlsEnabled;
+    }
 }