Connector/NET commit: r1034 - in branches/5.0: . Driver/Source

[rburnett]

Modified:
   branches/5.0/CHANGES
   branches/5.0/Driver/Source/Installer.cs
Log:
  - Fixed problem with installer where the installation might report a failure to
    remove the performance counters if the performance counter category had already 
    been removed for some reason    


Modified: branches/5.0/CHANGES
===================================================================
--- branches/5.0/CHANGES	2007-10-15 21:40:12 UTC (rev 1033)
+++ branches/5.0/CHANGES	2007-10-15 21:42:54 UTC (rev 1034)
@@ -9,7 +9,10 @@
     handler.  Not sure why you would want to do this but...  (bug #30964)
   - Fixed issue where column name metadata was not using the charset given on the connection string
     (Bug #31185)
-
+  - Fixed problem with installer where the installation might report a failure to
+    remove the performance counters if the performance counter category had already 
+    been removed for some reason    
+    
 Version 5.0.8   8/16/2007
 
   Bug #28706 Log messages are truncated  

Modified: branches/5.0/Driver/Source/Installer.cs
===================================================================
--- branches/5.0/Driver/Source/Installer.cs	2007-10-15 21:40:12 UTC (rev 1033)
+++ branches/5.0/Driver/Source/Installer.cs	2007-10-15 21:42:54 UTC (rev 1034)
@@ -38,7 +38,9 @@
     [RunInstaller(true)]
 	public class CustomInstaller : Installer
 	{
-        public CustomInstaller()
+		int perfMonIndex;
+		
+		public CustomInstaller()
         {
             // add in a perf mon installer
             PerformanceCounterInstaller p = new PerformanceCounterInstaller();
@@ -58,7 +60,7 @@
 
             p.Counters.Add(ccd1);
             p.Counters.Add(ccd2);
-            Installers.Add(p);
+            perfMonIndex = Installers.Add(p);
         }
 
 		/// <summary>
@@ -150,6 +152,11 @@
 		/// <param name="savedState"></param>
 		public override void Uninstall(System.Collections.IDictionary savedState)
 		{
+			// if our category doesn't exist, then we don't want to run the perf mon
+			// installer
+			if (!PerformanceCounterCategory.Exists(Resources.PerfMonCategoryName))
+				base.Installers.RemoveAt(perfMonIndex);
+
 			base.Uninstall(savedState);
 
 			RemoveProviderFromMachineConfig();