Making GitSsl non-disposable, to avoid IDisposable explosion. Addressing StyleCop issues

Author: Tomas Urbonaitis

GVFS/GVFS.Common/Git/GitSsl.cs

@@ -9,19 +9,12 @@
 
 namespace GVFS.Common.Git
 {
-    public class GitSsl : IDisposable
+    public class GitSsl
     {
         public readonly string CertificatePathOrSubjectCommonName;
         public readonly bool IsCertificatePasswordProtected;
         public readonly bool ShouldVerify;
 
-        private readonly Lazy<X509Store> store = new Lazy<X509Store>(() =>
-        {
-            X509Store s = new X509Store();
-            s.Open(OpenFlags.OpenExistingOnly | OpenFlags.ReadOnly);
-            return s;
-        });
-
         public GitSsl()
         {
             this.CertificatePathOrSubjectCommonName = null;
@@ -81,6 +74,34 @@ public X509Certificate2 GetCertificate(ITracer tracer, string certificatePasswor
             return result;
         }
 
+        private static void LogCertificateCounts(ITracer tracer, EventMetadata metadata, IEnumerable<X509Certificate2> certificates, string messageTemplate)
+        {
+            Action<EventMetadata, string> loggingFunction;
+            int numberOfCertificates = certificates.Count();
+
+            switch (numberOfCertificates)
+            {
+                case 0:
+                    loggingFunction = tracer.RelatedError;
+                    break;
+                case 1:
+                    loggingFunction = tracer.RelatedInfo;
+                    break;
+                default:
+                    loggingFunction = tracer.RelatedWarning;
+                    break;
+            }
+
+            loggingFunction(
+                metadata,
+                string.Format(
+                    messageTemplate,
+                    numberOfCertificates,
+                    string.Join(
+                        Environment.NewLine,
+                        certificates.Select(x => x.Subject))));
+        }
+
         private X509Certificate2 GetCertificateFromFile(ITracer tracer, EventMetadata metadata, string certificatePassword, bool onlyLoadValidCertificateFromStore)
         {
             if (File.Exists(this.CertificatePathOrSubjectCommonName))
@@ -109,9 +130,13 @@ private X509Certificate2 GetCertificateFromFile(ITracer tracer, EventMetadata me
 
         private X509Certificate2 GetCertificateFromStore(ITracer tracer, EventMetadata metadata, bool onlyLoadValidCertificateFromStore)
         {
+            X509Store store = null;
             try
             {
-                X509Certificate2Collection findResults = this.store.Value.Certificates.Find(X509FindType.FindBySubjectName, this.CertificatePathOrSubjectCommonName, onlyLoadValidCertificateFromStore);
+                store = new X509Store();
+                store.Open(OpenFlags.OpenExistingOnly | OpenFlags.ReadOnly);
+
+                X509Certificate2Collection findResults = store.Certificates.Find(X509FindType.FindBySubjectName, this.CertificatePathOrSubjectCommonName, onlyLoadValidCertificateFromStore);
                 if (findResults?.Count > 0)
                 {
                     LogCertificateCounts(tracer, metadata, findResults.OfType<X509Certificate2>(), "Found {0} certificates by provided name. Matching DNs: {1}");
@@ -135,44 +160,12 @@ private X509Certificate2 GetCertificateFromStore(ITracer tracer, EventMetadata m
                 tracer.RelatedError(metadata, "Error, while searching for certificate in store");
                 return null;
             }
-
-            return null;
-        }
-
-        private static void LogCertificateCounts(ITracer tracer, EventMetadata metadata, IEnumerable<X509Certificate2> certificates, string messageTemplate)
-        {
-            Action<EventMetadata, string> loggingFunction;
-            int numberOfCertificates = certificates.Count();
-
-            switch (numberOfCertificates)
+            finally
             {
-                case 0:
-                    loggingFunction = tracer.RelatedError;
-                    break;
-                case 1:
-                    loggingFunction = tracer.RelatedInfo;
-                    break;
-                default:
-                    loggingFunction = tracer.RelatedWarning;
-                    break;
+                store.Dispose();
             }
 
-            loggingFunction(
-                metadata,
-                string.Format(
-                    messageTemplate,
-                    numberOfCertificates,
-                    string.Join(
-                        Environment.NewLine,
-                        certificates.Select(x => x.Subject))));
-        }
-
-        public void Dispose()
-        {
-            if (this.store.IsValueCreated)
-            {
-                this.store.Value.Dispose();
-            }
+            return null;
         }
     }
 }