From 6200e9dffc4e6a9cd842b6285fa23abecce28f62 Mon Sep 17 00:00:00 2001 From: Sean Date: Tue, 1 Apr 2025 12:56:40 -0400 Subject: [PATCH] Fix MySqlReader cleanup --- .../DataAccess/AnalystPriceTargetDA.cs | 4 +- .../DataAccess/AnalystRatingsDA.cs | 20 +++---- .../DataAccess/BalanceSheetDA.cs | 22 +++---- MarketData/MarketDataLib/DataAccess/CashDA.cs | 4 +- .../DataAccess/CashflowStatementDA.cs | 12 ++-- .../DataAccess/CompanyProfileDA.cs | 4 +- .../MarketDataLib/DataAccess/CompositeDA.cs | 8 +-- .../DataAccess/CurrencyConversionDA.cs | 4 +- .../MarketDataLib/DataAccess/DictionaryDA.cs | 5 +- .../DataAccess/DividendPaymentDA.cs | 16 ++--- .../MarketDataLib/DataAccess/ETFHoldingsDA.cs | 10 ++-- .../DataAccess/EarningsAnnouncementsDA.cs | 6 +- .../MarketDataLib/DataAccess/FundamentalDA.cs | 20 +++---- .../MarketDataLib/DataAccess/HeadlinesDA.cs | 45 +++----------- .../MarketDataLib/DataAccess/HistoricalDA.cs | 2 +- .../MarketDataLib/DataAccess/HolidayDA.cs | 8 +-- .../DataAccess/IncomeStatementDA.cs | 18 +++--- .../DataAccess/InsiderTransactionDA.cs | 6 +- .../MarketDataLib/DataAccess/LexicalDA.cs | 4 +- .../DataAccess/MStarSecurityDA.cs | 4 +- .../MarketDataLib/DataAccess/OptionsDA.cs | 52 ++-------------- .../MarketDataLib/DataAccess/PortfolioDA.cs | 28 ++++----- .../MarketDataLib/DataAccess/PremarketDA.cs | 10 ++-- .../MarketDataLib/DataAccess/PricingDA.cs | 60 +++++++++---------- .../MarketDataLib/DataAccess/SECFilingDA.cs | 7 +++ .../MarketDataLib/DataAccess/SplitsDA.cs | 5 +- MarketData/MarketDataLib/DataAccess/UserDA.cs | 4 +- .../MarketDataLib/DataAccess/ValuationDA.cs | 8 +-- .../MarketDataLib/DataAccess/WatchListDA.cs | 6 +- .../MarketDataLib/DataAccess/YieldCurveDA.cs | 16 ++--- .../MarketDataLib/DataAccess/ZacksRankDA.cs | 6 +- 31 files changed, 181 insertions(+), 243 deletions(-) diff --git a/MarketData/MarketDataLib/DataAccess/AnalystPriceTargetDA.cs b/MarketData/MarketDataLib/DataAccess/AnalystPriceTargetDA.cs index 18d494b..3deb08b 100755 --- a/MarketData/MarketDataLib/DataAccess/AnalystPriceTargetDA.cs +++ b/MarketData/MarketDataLib/DataAccess/AnalystPriceTargetDA.cs @@ -43,7 +43,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -83,7 +83,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } diff --git a/MarketData/MarketDataLib/DataAccess/AnalystRatingsDA.cs b/MarketData/MarketDataLib/DataAccess/AnalystRatingsDA.cs index f086d19..bedfb4e 100755 --- a/MarketData/MarketDataLib/DataAccess/AnalystRatingsDA.cs +++ b/MarketData/MarketDataLib/DataAccess/AnalystRatingsDA.cs @@ -59,7 +59,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -126,7 +126,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -157,7 +157,7 @@ namespace MarketData.DataAccess finally { if (null != sqlCommand) sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -204,7 +204,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -257,8 +257,6 @@ namespace MarketData.DataAccess sb.Append(" where A.date<=@maxDate "); sb.Append(" order by date"); - - strQuery = sb.ToString(); ; sqlCommand = new MySqlCommand(strQuery, sqlConnection); sqlCommand.CommandTimeout = SqlUtils.COMMAND_TIMEOUT; @@ -286,7 +284,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -352,7 +350,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -417,7 +415,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -491,7 +489,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -528,7 +526,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } diff --git a/MarketData/MarketDataLib/DataAccess/BalanceSheetDA.cs b/MarketData/MarketDataLib/DataAccess/BalanceSheetDA.cs index 204b9b1..e98b14b 100755 --- a/MarketData/MarketDataLib/DataAccess/BalanceSheetDA.cs +++ b/MarketData/MarketDataLib/DataAccess/BalanceSheetDA.cs @@ -48,7 +48,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -87,7 +87,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -145,7 +145,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -181,7 +181,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -219,7 +219,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -257,7 +257,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -314,7 +314,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -369,7 +369,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -411,7 +411,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -453,7 +453,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -495,7 +495,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } diff --git a/MarketData/MarketDataLib/DataAccess/CashDA.cs b/MarketData/MarketDataLib/DataAccess/CashDA.cs index 8fae563..31de8f1 100755 --- a/MarketData/MarketDataLib/DataAccess/CashDA.cs +++ b/MarketData/MarketDataLib/DataAccess/CashDA.cs @@ -82,7 +82,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -116,7 +116,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } diff --git a/MarketData/MarketDataLib/DataAccess/CashflowStatementDA.cs b/MarketData/MarketDataLib/DataAccess/CashflowStatementDA.cs index 84a6f93..e35c113 100755 --- a/MarketData/MarketDataLib/DataAccess/CashflowStatementDA.cs +++ b/MarketData/MarketDataLib/DataAccess/CashflowStatementDA.cs @@ -59,7 +59,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -95,7 +95,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -133,7 +133,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -171,7 +171,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -221,7 +221,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -269,7 +269,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } diff --git a/MarketData/MarketDataLib/DataAccess/CompanyProfileDA.cs b/MarketData/MarketDataLib/DataAccess/CompanyProfileDA.cs index 36e45c4..af8edc5 100755 --- a/MarketData/MarketDataLib/DataAccess/CompanyProfileDA.cs +++ b/MarketData/MarketDataLib/DataAccess/CompanyProfileDA.cs @@ -110,7 +110,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -152,7 +152,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } diff --git a/MarketData/MarketDataLib/DataAccess/CompositeDA.cs b/MarketData/MarketDataLib/DataAccess/CompositeDA.cs index 4d3808c..479a599 100755 --- a/MarketData/MarketDataLib/DataAccess/CompositeDA.cs +++ b/MarketData/MarketDataLib/DataAccess/CompositeDA.cs @@ -189,7 +189,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -242,7 +242,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -289,7 +289,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -349,7 +349,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } diff --git a/MarketData/MarketDataLib/DataAccess/CurrencyConversionDA.cs b/MarketData/MarketDataLib/DataAccess/CurrencyConversionDA.cs index dc7ba4d..7e0cd37 100755 --- a/MarketData/MarketDataLib/DataAccess/CurrencyConversionDA.cs +++ b/MarketData/MarketDataLib/DataAccess/CurrencyConversionDA.cs @@ -49,7 +49,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -166,7 +166,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } diff --git a/MarketData/MarketDataLib/DataAccess/DictionaryDA.cs b/MarketData/MarketDataLib/DataAccess/DictionaryDA.cs index 800f8b3..8636fbf 100755 --- a/MarketData/MarketDataLib/DataAccess/DictionaryDA.cs +++ b/MarketData/MarketDataLib/DataAccess/DictionaryDA.cs @@ -133,7 +133,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -221,6 +221,7 @@ namespace MarketData.DataAccess } finally { + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if(null!=sqlCommand)sqlCommand.Dispose(); if (null != sqlConnection) sqlConnection.Close(); } @@ -264,6 +265,7 @@ namespace MarketData.DataAccess { if(null!=sqlCommand)sqlCommand.Dispose(); if (null != sqlConnection) sqlConnection.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} } } public static DictionaryCollection GetDictionaryCollection() @@ -304,6 +306,7 @@ namespace MarketData.DataAccess { if(null!=sqlCommand)sqlCommand.Dispose(); if (null != sqlConnection) sqlConnection.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} } } private static bool DeleteDictionaryCollection(DictionaryCollection dictionaryCollection, MySqlConnection sqlConnection, MySqlTransaction sqlTransaction) diff --git a/MarketData/MarketDataLib/DataAccess/DividendPaymentDA.cs b/MarketData/MarketDataLib/DataAccess/DividendPaymentDA.cs index 529d888..54cb0a5 100755 --- a/MarketData/MarketDataLib/DataAccess/DividendPaymentDA.cs +++ b/MarketData/MarketDataLib/DataAccess/DividendPaymentDA.cs @@ -50,7 +50,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if(null!=sqlDataReader)sqlDataReader.Dispose(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -94,7 +94,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if(null!=sqlDataReader)sqlDataReader.Dispose(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -144,7 +144,7 @@ namespace MarketData.DataAccess finally { if (null != sqlCommand) sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Dispose(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -194,7 +194,7 @@ namespace MarketData.DataAccess finally { if (null != sqlCommand) sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Dispose(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -239,7 +239,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if(null!=sqlDataReader)sqlDataReader.Dispose(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -278,7 +278,7 @@ namespace MarketData.DataAccess finally { if (null != sqlCommand) sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Dispose(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -316,7 +316,7 @@ namespace MarketData.DataAccess finally { if (null != sqlCommand) sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Dispose(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -360,7 +360,7 @@ namespace MarketData.DataAccess finally { if (null != sqlCommand) sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Dispose(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } diff --git a/MarketData/MarketDataLib/DataAccess/ETFHoldingsDA.cs b/MarketData/MarketDataLib/DataAccess/ETFHoldingsDA.cs index 752b75f..ffde864 100755 --- a/MarketData/MarketDataLib/DataAccess/ETFHoldingsDA.cs +++ b/MarketData/MarketDataLib/DataAccess/ETFHoldingsDA.cs @@ -45,7 +45,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -79,7 +79,7 @@ namespace MarketData.DataAccess } finally { - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -196,7 +196,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -240,7 +240,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -284,7 +284,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } diff --git a/MarketData/MarketDataLib/DataAccess/EarningsAnnouncementsDA.cs b/MarketData/MarketDataLib/DataAccess/EarningsAnnouncementsDA.cs index 0009eeb..b280734 100755 --- a/MarketData/MarketDataLib/DataAccess/EarningsAnnouncementsDA.cs +++ b/MarketData/MarketDataLib/DataAccess/EarningsAnnouncementsDA.cs @@ -52,7 +52,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -96,7 +96,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -138,7 +138,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } diff --git a/MarketData/MarketDataLib/DataAccess/FundamentalDA.cs b/MarketData/MarketDataLib/DataAccess/FundamentalDA.cs index 6a74edf..0c0749c 100755 --- a/MarketData/MarketDataLib/DataAccess/FundamentalDA.cs +++ b/MarketData/MarketDataLib/DataAccess/FundamentalDA.cs @@ -43,7 +43,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -79,7 +79,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if(null!=sqlDataReader)sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if(null != sqlConnection) sqlConnection.Close(); } } @@ -122,7 +122,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -165,7 +165,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -209,7 +209,7 @@ namespace MarketData.DataAccess finally { if (null != sqlCommand) sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -275,7 +275,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -344,7 +344,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -382,7 +382,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -455,7 +455,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -535,7 +535,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } diff --git a/MarketData/MarketDataLib/DataAccess/HeadlinesDA.cs b/MarketData/MarketDataLib/DataAccess/HeadlinesDA.cs index 0f15b6e..d1362ad 100755 --- a/MarketData/MarketDataLib/DataAccess/HeadlinesDA.cs +++ b/MarketData/MarketDataLib/DataAccess/HeadlinesDA.cs @@ -45,7 +45,7 @@ namespace MarketData.DataAccess finally { if (null != sqlCommand) sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -80,7 +80,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -123,7 +123,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -166,7 +166,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -211,7 +211,7 @@ namespace MarketData.DataAccess finally { if (null != sqlCommand) sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -255,7 +255,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -298,7 +298,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -399,36 +399,5 @@ namespace MarketData.DataAccess if(null!=sqlDataReader){sqlDataReader.Close();sqlDataReader.Dispose();} } } - //private static bool HeadlineExists(Headline headline,MySqlConnection sqlConnection,MySqlTransaction sqlTransaction) - //{ - // MySqlDataReader sqlDataReader=null; - // MySqlCommand sqlCommand=null; - // String strQuery = null; - - // try - // { - // if (null == headline || null == headline.Symbol) return false; - // StringBuilder sb = new StringBuilder(); - // sb.Append("select count(*) from headlines where symbol=").Append(SqlUtils.AddQuotes(headline.Symbol)).Append(" and "); - // sb.Append(" asof=").Append(SqlUtils.AddQuotes(SqlUtils.SqlDate(headline.Date))).Append(" and "); - // sb.Append(" headline=").Append(SqlUtils.AddQuotes(SqlUtils.SqlString(headline.Entry))); - // strQuery = sb.ToString(); - // sqlCommand = new MySqlCommand(strQuery, sqlConnection, sqlTransaction); - // sqlCommand.CommandTimeout = SqlUtils.COMMAND_TIMEOUT; - // sqlDataReader=sqlCommand.ExecuteReader(); - // if(!sqlDataReader.Read())return false; - // return 0==sqlDataReader.GetInt32(0)?false:true; - // } - // catch (Exception exception) - // { - // MDTrace.WriteLine(LogLevel.DEBUG,exception); - // return false; - // } - // finally - // { - // if(null!=sqlCommand)sqlCommand.Dispose(); - // if(null!=sqlDataReader){sqlDataReader.Close();sqlDataReader.Dispose();} - // } - //} } } diff --git a/MarketData/MarketDataLib/DataAccess/HistoricalDA.cs b/MarketData/MarketDataLib/DataAccess/HistoricalDA.cs index bd7ad21..71fb23c 100755 --- a/MarketData/MarketDataLib/DataAccess/HistoricalDA.cs +++ b/MarketData/MarketDataLib/DataAccess/HistoricalDA.cs @@ -56,7 +56,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } diff --git a/MarketData/MarketDataLib/DataAccess/HolidayDA.cs b/MarketData/MarketDataLib/DataAccess/HolidayDA.cs index 0b899b1..475b6bb 100755 --- a/MarketData/MarketDataLib/DataAccess/HolidayDA.cs +++ b/MarketData/MarketDataLib/DataAccess/HolidayDA.cs @@ -44,7 +44,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand) sqlCommand.Dispose(); - if(null!=sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if(null!=sqlConnection) sqlConnection.Close(); } } @@ -79,7 +79,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand) sqlCommand.Dispose(); - if(null!=sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if(null!=sqlConnection) sqlConnection.Close(); } } @@ -115,7 +115,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand) sqlCommand.Dispose(); - if(null!=sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if(null!=sqlConnection) sqlConnection.Close(); } } @@ -151,7 +151,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand) sqlCommand.Dispose(); - if(null!=sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if(null!=sqlConnection) sqlConnection.Close(); } } diff --git a/MarketData/MarketDataLib/DataAccess/IncomeStatementDA.cs b/MarketData/MarketDataLib/DataAccess/IncomeStatementDA.cs index a8788ef..a956d32 100755 --- a/MarketData/MarketDataLib/DataAccess/IncomeStatementDA.cs +++ b/MarketData/MarketDataLib/DataAccess/IncomeStatementDA.cs @@ -42,7 +42,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -80,7 +80,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -118,7 +118,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -170,7 +170,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -212,7 +212,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -260,7 +260,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -309,7 +309,7 @@ namespace MarketData.DataAccess finally { if (null != sqlCommand) sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -359,7 +359,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -410,7 +410,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } diff --git a/MarketData/MarketDataLib/DataAccess/InsiderTransactionDA.cs b/MarketData/MarketDataLib/DataAccess/InsiderTransactionDA.cs index 2baca59..82e4769 100755 --- a/MarketData/MarketDataLib/DataAccess/InsiderTransactionDA.cs +++ b/MarketData/MarketDataLib/DataAccess/InsiderTransactionDA.cs @@ -50,7 +50,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -102,7 +102,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -155,7 +155,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } diff --git a/MarketData/MarketDataLib/DataAccess/LexicalDA.cs b/MarketData/MarketDataLib/DataAccess/LexicalDA.cs index 3974d46..e0fc8bf 100755 --- a/MarketData/MarketDataLib/DataAccess/LexicalDA.cs +++ b/MarketData/MarketDataLib/DataAccess/LexicalDA.cs @@ -132,7 +132,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -223,6 +223,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -264,6 +265,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } diff --git a/MarketData/MarketDataLib/DataAccess/MStarSecurityDA.cs b/MarketData/MarketDataLib/DataAccess/MStarSecurityDA.cs index 0557a85..fd0ac31 100755 --- a/MarketData/MarketDataLib/DataAccess/MStarSecurityDA.cs +++ b/MarketData/MarketDataLib/DataAccess/MStarSecurityDA.cs @@ -46,7 +46,7 @@ namespace MarketData.DataAccess finally { if (null != sqlCommand) sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -173,7 +173,7 @@ namespace MarketData.DataAccess finally { if (null != sqlCommand) sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } diff --git a/MarketData/MarketDataLib/DataAccess/OptionsDA.cs b/MarketData/MarketDataLib/DataAccess/OptionsDA.cs index 2dc31a9..b358857 100755 --- a/MarketData/MarketDataLib/DataAccess/OptionsDA.cs +++ b/MarketData/MarketDataLib/DataAccess/OptionsDA.cs @@ -44,7 +44,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -98,7 +98,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -153,7 +153,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -204,7 +204,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -257,7 +257,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -304,7 +304,6 @@ namespace MarketData.DataAccess sb.Append(" and strike=").Append(Utility.FormatNumber(option.Strike,2)); sb.Append(" and option_type=").Append(SqlUtils.AddQuotes(option.Type.Equals(OptionTypeEnum.CallOption) ? "C" : "P")); strQuery = sb.ToString(); -// MDTrace.WriteLine(LogLevel.DEBUG,String.Format("DeleteOption {0},{1},{2},{3}",option.Symbol,Utility.DateTimeToStringMMHDDHYYYY(option.Expiration),option.Type.Equals(OptionTypeEnum.CallOption)?"Call":"Put",option.Strike)); sqlCommand = new MySqlCommand(strQuery, sqlConnection, sqlTransaction); sqlCommand.CommandTimeout = SqlUtils.COMMAND_TIMEOUT; sqlCommand.ExecuteNonQuery(); @@ -323,43 +322,6 @@ namespace MarketData.DataAccess if (null != sqlConnection) { sqlConnection.Close(); sqlConnection = null; } } } -// private static bool DeleteOption(Option option) -// { -// MySqlConnection sqlConnection = null; -// MySqlCommand sqlCommand = null; -// MySqlTransaction sqlTransaction=null; -// String strQuery = null; -// try -// { -// StringBuilder sb = new StringBuilder(); -// sqlConnection = SqlUtils.CreateMySqlConnection(MainDataSource.Instance.LocateDataSource("market_data")); -// sqlTransaction = sqlConnection.BeginTransaction(System.Data.IsolationLevel.ReadCommitted); -// sb.Append("delete from options where symbol=").Append(SqlUtils.AddQuotes(option.Symbol)); -// sb.Append(" and expiration_date=").Append(SqlUtils.AddQuotes(Utility.DateTimeToStringYYYYHMMHDD(option.Expiration))); -// sb.Append(" and strike=").Append(Utility.FormatNumber(option.Strike,2)); -// sb.Append(" and option_type=").Append(SqlUtils.AddQuotes(option.Type.Equals(OptionTypeEnum.CallOption) ? "C" : "P")); -// strQuery = sb.ToString(); -//// MDTrace.WriteLine(LogLevel.DEBUG,String.Format("DeleteOption {0},{1},{2},{3}",option.Symbol,Utility.DateTimeToStringMMHDDHYYYY(option.Expiration),option.Type.Equals(OptionTypeEnum.CallOption)?"Call":"Put",option.Strike)); -// sqlCommand = new MySqlCommand(strQuery, sqlConnection, sqlTransaction); -// sqlCommand.CommandTimeout = SqlUtils.COMMAND_TIMEOUT; -// sqlCommand.ExecuteNonQuery(); -// sqlTransaction.Commit(); -// sqlCommand.Dispose(); -// sqlCommand = null; -// return true; -// } -// catch (Exception exception) -// { -// MDTrace.WriteLine(LogLevel.DEBUG,exception); -// return false; -// } -// finally -// { -// if (null != sqlCommand) { sqlCommand.Dispose(); sqlCommand = null; } -// if (null != sqlConnection) { sqlConnection.Close(); sqlConnection.Dispose();sqlConnection = null; } -// if(null!=sqlTransaction){sqlTransaction.Dispose();sqlTransaction=null;} -// } -// } public static bool AddOptions(Options options) { foreach (Option option in options) @@ -377,10 +339,8 @@ namespace MarketData.DataAccess try { -// MDTrace.WriteLine(LogLevel.DEBUG,"[AddOption]Enter"); DateTime modified = DateTime.Now; if (null == option) return false; -// DeleteOption(option); sqlConnection = SqlUtils.CreateMySqlConnection(MainDataSource.Instance.LocateDataSource("market_data")); sqlTransaction = sqlConnection.BeginTransaction(System.Data.IsolationLevel.ReadCommitted); DeleteOption(option,sqlTransaction); @@ -406,7 +366,6 @@ namespace MarketData.DataAccess sb.Append(SqlUtils.AddQuotes(Utility.DateTimeToStringYYYYHMMHDD(modified))); sb.Append(")"); strQuery = sb.ToString(); -// MDTrace.WriteLine(LogLevel.DEBUG,String.Format("AddOption {0},{1},{2},{3}",option.Symbol,Utility.DateTimeToStringMMHDDHYYYY(option.Expiration),option.Type.Equals(OptionTypeEnum.CallOption)?"Call":"Put",option.Strike)); sqlCommand = new MySqlCommand(strQuery, sqlConnection, sqlTransaction); sqlCommand.CommandTimeout = SqlUtils.COMMAND_TIMEOUT; sqlCommand.ExecuteNonQuery(); @@ -425,7 +384,6 @@ namespace MarketData.DataAccess if(null!=sqlCommand)sqlCommand.Dispose(); if (null != sqlConnection) sqlConnection.Close(); if (null != sqlTransaction) sqlTransaction.Dispose(); -// MDTrace.WriteLine(LogLevel.DEBUG,"[AddOption]LEAVE"); } } } diff --git a/MarketData/MarketDataLib/DataAccess/PortfolioDA.cs b/MarketData/MarketDataLib/DataAccess/PortfolioDA.cs index 35c558b..81360c5 100755 --- a/MarketData/MarketDataLib/DataAccess/PortfolioDA.cs +++ b/MarketData/MarketDataLib/DataAccess/PortfolioDA.cs @@ -52,7 +52,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand) sqlCommand.Dispose(); - if(null!=sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if(null!=sqlConnection) sqlConnection.Close(); } } @@ -176,7 +176,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand) sqlCommand.Dispose(); - if(null!=sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if(null!=sqlConnection) sqlConnection.Close(); } } @@ -212,7 +212,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand) sqlCommand.Dispose(); - if(null!=sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if(null!=sqlConnection) sqlConnection.Close(); } } @@ -383,7 +383,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -434,7 +434,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -485,7 +485,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -536,7 +536,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -605,7 +605,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -659,7 +659,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -711,7 +711,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -762,7 +762,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -857,7 +857,7 @@ namespace MarketData.DataAccess finally { if (null != sqlCommand) sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -889,7 +889,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -954,7 +954,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } diff --git a/MarketData/MarketDataLib/DataAccess/PremarketDA.cs b/MarketData/MarketDataLib/DataAccess/PremarketDA.cs index 9a01829..56750d3 100755 --- a/MarketData/MarketDataLib/DataAccess/PremarketDA.cs +++ b/MarketData/MarketDataLib/DataAccess/PremarketDA.cs @@ -118,7 +118,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand) sqlCommand.Dispose(); - if(null!=sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if(null!=sqlConnection) sqlConnection.Close(); } } @@ -153,7 +153,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand) sqlCommand.Dispose(); - if(null!=sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if(null!=sqlConnection) sqlConnection.Close(); } } @@ -191,7 +191,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand) sqlCommand.Dispose(); - if(null!=sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if(null!=sqlConnection) sqlConnection.Close(); } } @@ -237,7 +237,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand) sqlCommand.Dispose(); - if(null!=sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if(null!=sqlConnection) sqlConnection.Close(); } } @@ -272,7 +272,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand) sqlCommand.Dispose(); - if(null!=sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if(null!=sqlConnection) sqlConnection.Close(); } } diff --git a/MarketData/MarketDataLib/DataAccess/PricingDA.cs b/MarketData/MarketDataLib/DataAccess/PricingDA.cs index da4bf35..7b50389 100755 --- a/MarketData/MarketDataLib/DataAccess/PricingDA.cs +++ b/MarketData/MarketDataLib/DataAccess/PricingDA.cs @@ -87,7 +87,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -129,7 +129,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -165,7 +165,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand) sqlCommand.Dispose(); - if(null!=sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if(null!=sqlConnection) sqlConnection.Close(); } } @@ -211,7 +211,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -247,7 +247,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -284,7 +284,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand) sqlCommand.Dispose(); - if(null!=sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if(null!=sqlConnection) sqlConnection.Close(); } } @@ -326,7 +326,7 @@ namespace MarketData.DataAccess finally { if (null != sqlCommand) sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -362,7 +362,7 @@ namespace MarketData.DataAccess finally { if (null != sqlCommand) sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -400,7 +400,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand) sqlCommand.Dispose(); - if(null!=sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if(null!=sqlConnection) sqlConnection.Close(); } } @@ -437,7 +437,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -476,7 +476,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -513,7 +513,7 @@ namespace MarketData.DataAccess finally { if (null != sqlCommand) sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -551,7 +551,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand) sqlCommand.Dispose(); - if(null!=sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if(null!=sqlConnection) sqlConnection.Close(); } } @@ -588,7 +588,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -625,7 +625,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -670,7 +670,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -707,7 +707,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -743,7 +743,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -779,7 +779,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -819,7 +819,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -855,7 +855,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -940,7 +940,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -993,7 +993,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -1048,7 +1048,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -1103,7 +1103,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -1157,7 +1157,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -1212,7 +1212,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand) sqlCommand.Dispose(); - if(null!=sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if(null!=sqlConnection) sqlConnection.Close(); MDTrace.WriteLine(LogLevel.DEBUG,String.Format("[GetPricesForward] Done, took {0}(ms)",profiler.End())); } @@ -1262,7 +1262,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -1320,7 +1320,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -1370,7 +1370,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } diff --git a/MarketData/MarketDataLib/DataAccess/SECFilingDA.cs b/MarketData/MarketDataLib/DataAccess/SECFilingDA.cs index c7aea2c..737315b 100755 --- a/MarketData/MarketDataLib/DataAccess/SECFilingDA.cs +++ b/MarketData/MarketDataLib/DataAccess/SECFilingDA.cs @@ -51,6 +51,7 @@ namespace MarketData.DataAccess if (null != sqlDataReader) { sqlDataReader.Close(); + sqlDataReader.Dispose(); sqlDataReader = null; } } @@ -96,6 +97,7 @@ namespace MarketData.DataAccess if (null != sqlDataReader) { sqlDataReader.Close(); + sqlDataReader.Dispose(); sqlDataReader = null; } } @@ -141,6 +143,7 @@ namespace MarketData.DataAccess if (null != sqlDataReader) { sqlDataReader.Close(); + sqlDataReader.Dispose(); sqlDataReader = null; } } @@ -185,6 +188,7 @@ namespace MarketData.DataAccess if (null != sqlDataReader) { sqlDataReader.Close(); + sqlDataReader.Dispose(); sqlDataReader = null; } } @@ -227,6 +231,7 @@ namespace MarketData.DataAccess if (null != sqlDataReader) { sqlDataReader.Close(); + sqlDataReader.Dispose(); sqlDataReader = null; } } @@ -415,6 +420,7 @@ namespace MarketData.DataAccess if (null != sqlDataReader) { sqlDataReader.Close(); + sqlDataReader.Dispose(); sqlDataReader = null; } } @@ -476,6 +482,7 @@ namespace MarketData.DataAccess if (null != sqlDataReader) { sqlDataReader.Close(); + sqlDataReader.Dispose(); sqlDataReader = null; } } diff --git a/MarketData/MarketDataLib/DataAccess/SplitsDA.cs b/MarketData/MarketDataLib/DataAccess/SplitsDA.cs index e4b0897..25c6a9b 100755 --- a/MarketData/MarketDataLib/DataAccess/SplitsDA.cs +++ b/MarketData/MarketDataLib/DataAccess/SplitsDA.cs @@ -52,7 +52,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -145,6 +145,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -192,6 +193,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -237,6 +239,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } diff --git a/MarketData/MarketDataLib/DataAccess/UserDA.cs b/MarketData/MarketDataLib/DataAccess/UserDA.cs index e91d05e..043ccc9 100755 --- a/MarketData/MarketDataLib/DataAccess/UserDA.cs +++ b/MarketData/MarketDataLib/DataAccess/UserDA.cs @@ -41,8 +41,8 @@ namespace MarketData.DataAccess } finally { - if(null != sqlDataReader)sqlDataReader.Dispose(); if(null != sqlCommand)sqlCommand.Dispose(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if(null != sqlConnection) sqlConnection.Close(); } } @@ -83,8 +83,8 @@ namespace MarketData.DataAccess } finally { - if(null!=sqlDataReader)sqlDataReader.Dispose(); if(null!=sqlCommand)sqlCommand.Dispose(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } diff --git a/MarketData/MarketDataLib/DataAccess/ValuationDA.cs b/MarketData/MarketDataLib/DataAccess/ValuationDA.cs index db82915..88030cd 100755 --- a/MarketData/MarketDataLib/DataAccess/ValuationDA.cs +++ b/MarketData/MarketDataLib/DataAccess/ValuationDA.cs @@ -43,7 +43,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -75,7 +75,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -187,7 +187,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -246,8 +246,6 @@ namespace MarketData.DataAccess else sb.Append(SqlUtils.AddQuotes(valuation.RevenueDates)).Append(","); if (double.IsNaN(valuation.AverageRevenueGrowth) || double.IsInfinity(valuation.AverageRevenueGrowth)) sb.Append("null").Append(","); else sb.Append(valuation.AverageRevenueGrowth).Append(","); -// if (double.IsNaN(valuation.AverageRevenueGrowthQtr) || double.IsInfinity(valuation.AverageRevenueGrowthQtr)) sb.Append("null").Append(","); -// else sb.Append(valuation.AverageRevenueGrowthQtr).Append(","); if (double.IsNaN(valuation.AverageRevenueGrowth2Y) || double.IsInfinity(valuation.AverageRevenueGrowth2Y)) sb.Append("null").Append(","); else sb.Append(valuation.AverageRevenueGrowth2Y).Append(","); if (double.IsNaN(valuation.AverageRevenueGrowth4Y) || double.IsInfinity(valuation.AverageRevenueGrowth4Y)) sb.Append("null").Append(","); diff --git a/MarketData/MarketDataLib/DataAccess/WatchListDA.cs b/MarketData/MarketDataLib/DataAccess/WatchListDA.cs index 30a20c4..e1366ba 100755 --- a/MarketData/MarketDataLib/DataAccess/WatchListDA.cs +++ b/MarketData/MarketDataLib/DataAccess/WatchListDA.cs @@ -158,7 +158,7 @@ namespace MarketData.DataAccess finally { if (null != sqlCommand) sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -195,7 +195,7 @@ namespace MarketData.DataAccess finally { if (null != sqlCommand) sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -231,7 +231,7 @@ namespace MarketData.DataAccess finally { if (null != sqlCommand) sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } diff --git a/MarketData/MarketDataLib/DataAccess/YieldCurveDA.cs b/MarketData/MarketDataLib/DataAccess/YieldCurveDA.cs index 8e44528..ddbff24 100755 --- a/MarketData/MarketDataLib/DataAccess/YieldCurveDA.cs +++ b/MarketData/MarketDataLib/DataAccess/YieldCurveDA.cs @@ -151,7 +151,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -197,7 +197,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -247,7 +247,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -296,7 +296,7 @@ namespace MarketData.DataAccess finally { if(null != sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -345,7 +345,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -380,7 +380,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -411,7 +411,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -446,7 +446,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } diff --git a/MarketData/MarketDataLib/DataAccess/ZacksRankDA.cs b/MarketData/MarketDataLib/DataAccess/ZacksRankDA.cs index ac15010..e22ab3e 100755 --- a/MarketData/MarketDataLib/DataAccess/ZacksRankDA.cs +++ b/MarketData/MarketDataLib/DataAccess/ZacksRankDA.cs @@ -50,7 +50,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -88,7 +88,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } } @@ -127,7 +127,7 @@ namespace MarketData.DataAccess finally { if(null!=sqlCommand)sqlCommand.Dispose(); - if (null != sqlDataReader) sqlDataReader.Close(); + if (null != sqlDataReader) {sqlDataReader.Close();sqlDataReader.Dispose();} if (null != sqlConnection) sqlConnection.Close(); } }