Close db connections in finally block

Fix bugs reported by sonar

Change-Id: I0d3445856eb45533d904443b60d75c8aa03e5881
Issue-ID: SO-580
Signed-off-by: Ethan Lynn <ethanlynnl@vmware.com>

diff --git a/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/resources/URNResource.java b/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/resources/URNResource.java
index 1304fc2..85f9753 100644 (file)
--- a/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/resources/URNResource.java
+++ b/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/resources/URNResource.java
@@ -60,14 +60,15 @@ public class URNResource extends AbstractCockpitPluginResource{
   public List<URNData> getUrnDataMap() \r
   {  \r
          List<URNData> list = new ArrayList();\r
-         \r
+         PreparedStatement psData = null;\r
+         ResultSet r = null;\r
          try {\r
                        \r
                    conn = getDBConnection();\r
-                           PreparedStatement psData = conn\r
+                           psData = conn\r
                                                .prepareStatement("select * from MSO_URN_MAPPING order by NAME_");\r
                            \r
-                           ResultSet r = psData.executeQuery();\r
+                           r = psData.executeQuery();\r
                            \r
                                while(r.next()) \r
                                {\r
@@ -78,14 +79,15 @@ public class URNResource extends AbstractCockpitPluginResource{
                                        \r
                                        list.add(d);                                    \r
                                }\r
-                               \r
-                           psData.close();\r
-                               conn.close();\r
                        \r
                } catch (Exception e) \r
                {\r
                        \r
                        e.printStackTrace();\r
+               } finally {\r
+                       try { r.close(); } catch (Exception e) { /* ignored */ }\r
+                       try { psData.close(); } catch (Exception e) { /* ignored */ }\r
+                       try { conn.close(); } catch (Exception e) { /* ignored */ }\r
                }\r
      \r
     for(URNData d: list)\r
@@ -158,24 +160,26 @@ public class URNResource extends AbstractCockpitPluginResource{
          nRow.setVer_("1");    \r
          final String myKey = key_;\r
          final String myValue = value_;\r
-         \r
+          \r
+           PreparedStatement psData = null;\r
                msoLogger.debug("----------- START ----------------------");\r
                try {\r
                        \r
                    conn = getDBConnection();\r
-                           PreparedStatement psData = conn\r
+                               psData = conn\r
                                                .prepareStatement("Insert into MSO_URN_MAPPING values ('" + key_ + "', '" + value_  + "', '1')");\r
                            \r
                            psData.executeUpdate();\r
                            \r
-                           psData.close();\r
-                               conn.close();\r
                        //}                      \r
                        \r
                } catch (Exception e) \r
                {\r
                        \r
                        e.printStackTrace();\r
+               } finally {\r
+                       try { psData.close(); } catch (Exception e) { /* ignored */ }\r
+                       try { conn.close(); } catch (Exception e) { /* ignored */ }\r
                }\r
        // getQueryService().executeQuery("cockpit.urnMap.insertNewRow", nRow, URNData.class);\r
    }\r
@@ -184,21 +188,22 @@ public class URNResource extends AbstractCockpitPluginResource{
   public void getPersistData(URNData d) {  \r
          \r
                //getQueryService().executeQuery("cockpit.urnMap.persistURNData", d, URNData.class);\r
-           \r
+         PreparedStatement psData = null;\r
          try {\r
                        \r
                    conn = getDBConnection();\r
-                       PreparedStatement psData = conn\r
+                               psData = conn\r
                                                .prepareStatement("UPDATE MSO_URN_MAPPING set VALUE_ ='"+ d.getURNValue() + "' WHERE NAME_='" + d.getURNName() + "'");\r
                            \r
                            psData.executeUpdate();\r
                            \r
-                           psData.close();\r
-                               conn.close();\r
                } catch (Exception e) \r
                {\r
                        \r
                        e.printStackTrace();\r
+               } finally {\r
+                       try { psData.close(); } catch (Exception e) { /* ignored */ }\r
+                       try { conn.close(); } catch (Exception e) { /* ignored */ }\r
                }\r
         \r
        }\r