Checkstyle fixes for prov eelf and utils

[dmaap/datarouter.git] / datarouter-prov / src / main / java / org / onap / dmaap / datarouter / provisioning / utils / DB.java

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