X-Git-Url: https://gerrit.onap.org/r/gitweb?p=dmaap%2Fdatarouter.git;a=blobdiff_plain;f=datarouter-prov%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdatarouter%2Fprovisioning%2Futils%2FDB.java;h=340b4213a87a8e9cacf19caf46c6b0d003d8b1de;hp=55b2c0386db5656f7ac33a69f0d87357bb9f20df;hb=381d4ebc5e83d5fd5b62fff7e5a6fa6d582149d9;hpb=632e4aaf606ca99ddc5a5cba11deb5e2ee2a90c5

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/DB.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/DB.java
index 55b2c038..340b4213 100644
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/DB.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/DB.java
@@ -21,7 +21,6 @@
  * *
  ******************************************************************************/
 
-
 package org.onap.dmaap.datarouter.provisioning.utils;
 
 import static java.lang.System.exit;
@@ -78,12 +77,12 @@ public class DB {
                 props.load(new FileInputStream(getProperty(
                     "org.onap.dmaap.datarouter.provserver.properties",
                     "/opt/app/datartr/etc/provserver.properties")));
-                String dbDriver = (String) props.get("org.onap.dmaap.datarouter.db.driver");
                 dbUrl = (String) props.get("org.onap.dmaap.datarouter.db.url");
                 dbLogin = (String) props.get("org.onap.dmaap.datarouter.db.login");
                 dbPassword = (String) props.get("org.onap.dmaap.datarouter.db.password");
                 httpsPort = (String) props.get("org.onap.dmaap.datarouter.provserver.https.port");
                 httpPort = (String) props.get("org.onap.dmaap.datarouter.provserver.http.port");
+                String dbDriver = (String) props.get("org.onap.dmaap.datarouter.db.driver");
                 Class.forName(dbDriver);
             } catch (IOException e) {
                 intlogger.error("PROV9003 Opening properties: " + e.getMessage(), e);
@@ -117,17 +116,18 @@ public class DB {
                     connection = queue.remove();
                 } catch (NoSuchElementException nseEx) {
                     intlogger.error("PROV9006 No connection on queue: " + nseEx.getMessage(), nseEx);
-                    int n = 0;
+                    int num = 0;
                     do {
                         // Try up to 3 times to get a connection
                         try {
                             connection = DriverManager.getConnection(dbUrl, dbLogin, dbPassword);
                         } catch (SQLException sqlEx) {
-                            if (++n >= 3) {
+                            if (++num >= 3) {
                                 throw sqlEx;
                             }
                         }
-                    } while (connection == null);
+                    }
+                    while (connection == null);
                 }
             }
             if (connection != null && !connection.isValid(1)) {