X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=datarouter-prov%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdatarouter%2Fprovisioning%2Futils%2FDB.java;h=7f0d56b7834d112bd7f1ddc5e4019c2a94f4f4b2;hb=26fb914c67acb060987671e0ce12d584d9786e54;hp=a907a03bc5c03c2838f0cd34b7c158f79d3d24bf;hpb=a9ebff578a1ce292c4d410446da7e9292250578d;p=dmaap%2Fdatarouter.git

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 a907a03b..7f0d56b7 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
@@ -38,14 +38,12 @@ import java.util.*;
  */
 public class DB {
 
-    /**
-     * The name of the properties file (in CLASSPATH)
-     */
+    private static Logger intlogger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal");
+
     private static String DB_URL;
     private static String DB_LOGIN;
     private static String DB_PASSWORD;
     private static Properties props;
-    private static Logger intlogger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal");
     private static final Queue<Connection> queue = new LinkedList<>();
 
     public static String HTTPS_PORT;
@@ -114,13 +112,16 @@ public class DB {
                                 throw sqlEx;
                             }
                         }
+                        finally {
+                            if (connection != null && !connection.isValid(1)) {
+                                connection.close();
+                                connection = null;
+                            }
+                        }
                     } while (connection == null);
                 }
             }
-            if (connection != null && !connection.isValid(1)) {
-                connection.close();
-                connection = null;
-            }
+
         }
         return connection;
     }