Close conn if exception is thrown

ConjurTech · Jul 6, 2018 · cb20e5d · cb20e5d
1 parent e41ec72
commit cb20e5d
Showing 1 changed file with 22 additions and 10 deletions.
diff --git a/neo-cli/Shell/MainService.cs b/neo-cli/Shell/MainService.cs
@@ -1083,21 +1083,33 @@ private static void WriteToPsql(SmartContractEvent contractEvent)
 
             using (var conn = new NpgsqlConnection(connString))
             {
-                conn.Open();
 
-                WriteToEventTable(contractEvent, conn);
-
-                if (contractEvent.eventType == "created")
+                try
                 {
-                    WriteToOfferTable(contractEvent, conn);
-                }
+                    conn.Open();
+
+                    WriteToEventTable(contractEvent, conn);
+
+                    if (contractEvent.eventType == "created")
+                    {
+                        WriteToOfferTable(contractEvent, conn);
+                    }
+
+                    if (contractEvent.eventType == "filled")
+                    {
+                        WriteToTradeTable(contractEvent, conn);
+                    }
 
-                if (contractEvent.eventType == "filled")
+                    conn.Close();
+                }
+                catch (Exception ex)
                 {
-                    WriteToTradeTable(contractEvent, conn);
+                    if (conn != null && conn.State == System.Data.ConnectionState.Open)
+                    {
+                        conn.Close();
+                    }
+                    throw ex;
                 }
-
-                conn.Close();
             }
 
         }