Close conn if it is open, regardless of exception.

ConjurTech · Jul 9, 2018 · a3d8acb · a3d8acb
1 parent 9c484f8
commit a3d8acb
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/neo-cli/Shell/MainService.cs b/neo-cli/Shell/MainService.cs
@@ -1087,7 +1087,7 @@ private static void WriteToPsql(SmartContractEvent contractEvent)
                 try
                 {
                     conn.Open();
-		    Console.WriteLine(String.Format("Connection state={0}", conn.State));
+		            Console.WriteLine(String.Format("Connection {0}", conn.State));
 
                     WriteToEventTable(contractEvent, conn);
 
@@ -1100,18 +1100,18 @@ private static void WriteToPsql(SmartContractEvent contractEvent)
                     {
                         WriteToTradeTable(contractEvent, conn);
                     }
-
-                    conn.Close();
-		    Console.WriteLine(String.Format("Connection state={0}", conn.State));
                 }
                 catch (Exception ex)
+                {
+                    throw ex;
+                }
+                finally
                 {
                     if (conn != null && conn.State == System.Data.ConnectionState.Open)
                     {
-		    	Console.WriteLine(String.Format("Connection state={0}", conn.State));
                         conn.Close();
+                        Console.WriteLine(String.Format("Connection {0}", conn.State));
                     }
-                    throw ex;
                 }
             }