Merge pull request #25 from adeniltonbs/master

Update
ZeusAutomacao · Aug 25, 2017 · e73fc97 · e73fc97
2 parents aabc63d + 89b89f6
commit e73fc97
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/CTe.Classes/ConfiguracaoServico.cs b/CTe.Classes/ConfiguracaoServico.cs
@@ -58,7 +58,18 @@ private ConfiguracaoServico()
         /// </summary>
         public ConfiguracaoCertificado ConfiguracaoCertificado { get; set; }
 
-        public X509Certificate2 X509Certificate2 { get { return ObterCertificado(); } }
+        private X509Certificate2 _certificado = null;
+        public X509Certificate2 X509Certificate2
+        {
+            get
+            {
+                if (this._certificado != null)
+                    if (!this.ConfiguracaoCertificado.ManterDadosEmCache)
+                        this._certificado.Reset();
+                _certificado = ObterCertificado();
+                return _certificado;
+            }
+        }
 
         private X509Certificate2 ObterCertificado()
         {

diff --git a/MDFe.Utils/Configuracoes/MDFeConfiguracao.cs b/MDFe.Utils/Configuracoes/MDFeConfiguracao.cs
@@ -69,8 +69,18 @@ private static MDFeVersaoWebService GetMdfeVersaoWebService()
             return _versaoWebService;
         }
 
-        public static X509Certificate2 X509Certificate2 { get { return ObterCertificado(); } }
-
+        private static X509Certificate2 _certificado = null;
+        public static X509Certificate2 X509Certificate2
+        {
+            get
+            {
+                if (_certificado != null)
+                    if (!ConfiguracaoCertificado.ManterDadosEmCache)
+                        _certificado.Reset();
+                _certificado = ObterCertificado();
+                return _certificado;
+            }
+        }
 
         public static bool NaoSalvarXml()
         {