bzr commit into connector-net-6.1 branch (vvaintroub:839)

[Vladislav Vaintroub]

#At file:///H:/connector_net/6.1/ based on revid:vvaintroub@stripped

  839 Vladislav Vaintroub	2010-08-06 [merge]
      merge

    modified:
      CHANGES
      MySql.Web/Providers/Source/MembershipProvider.cs
      MySql.Web/Providers/Source/RoleProvider.cs
=== modified file 'CHANGES'
--- a/CHANGES	2010-08-03 21:22:30 +0000
+++ b/CHANGES	2010-08-06 10:27:49 +0000
@@ -1,3 +1,5 @@
+- Dispose EventLog after use in MySql.Web.dll provider classes, to avoid wasting resources
+  (Bug #55793)
 - Fix calculation of lockAge in SessionProvider (Bug #55701)
 - Handle cases where server returns unparsable (out-of-range) double values
   (Bug#55644)

=== modified file 'MySql.Web/Providers/Source/MembershipProvider.cs'
--- a/MySql.Web/Providers/Source/MembershipProvider.cs	2009-08-04 15:12:22 +0000
+++ b/MySql.Web/Providers/Source/MembershipProvider.cs	2010-08-06 10:27:49 +0000
@@ -1147,14 +1147,16 @@ namespace MySql.Web.Security
 
         private void WriteToEventLog(Exception e, string action)
         {
-            EventLog log = new EventLog();
-            log.Source = eventSource;
-            log.Log = eventLog;
-            string message = "An exception occurred communicating with the data source." +
-                             Environment.NewLine + Environment.NewLine;
-            message += "Action: " + action + Environment.NewLine + Environment.NewLine;
-            message += "Exception: " + e;
-            log.WriteEntry(message);
+            using (EventLog log = new EventLog())
+            {
+                log.Source = eventSource;
+                log.Log = eventLog;
+                string message = "An exception occurred communicating with the data source." +
+                                 Environment.NewLine + Environment.NewLine;
+                message += "Action: " + action + Environment.NewLine + Environment.NewLine;
+                message += "Exception: " + e;
+                log.WriteEntry(message);
+            }
         }
 
         private MembershipUser GetUserFromReader(MySqlDataReader reader)

=== modified file 'MySql.Web/Providers/Source/RoleProvider.cs'
--- a/MySql.Web/Providers/Source/RoleProvider.cs	2010-02-12 18:13:11 +0000
+++ b/MySql.Web/Providers/Source/RoleProvider.cs	2010-08-06 10:27:49 +0000
@@ -599,13 +599,15 @@ namespace MySql.Web.Security
 
         private void WriteToEventLog(Exception e, string action)
         {
-            EventLog log = new EventLog();
-            log.Source = eventSource;
-            log.Log = eventLog;
-            string message = exceptionMessage + Environment.NewLine + Environment.NewLine;
-            message += "Action: " + action + Environment.NewLine + Environment.NewLine;
-            message += "Exception: " + e;
-            log.WriteEntry(message);
+            using (EventLog log = new EventLog())
+            {
+                log.Source = eventSource;
+                log.Log = eventLog;
+                string message = exceptionMessage + Environment.NewLine + Environment.NewLine;
+                message += "Action: " + action + Environment.NewLine + Environment.NewLine;
+                message += "Exception: " + e;
+                log.WriteEntry(message);
+            }
         }
 
         #endregion


Attachment: [text/bzr-bundle] bzr/[e-mail]