DNN-18204: refactoring code.

dnnsoftware · Mar 21, 2018 · 230f949 · 230f949
1 parent 0d904cc
commit 230f949
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/DNN Platform/Library/Entities/Portals/PortalInfo.cs b/DNN Platform/Library/Entities/Portals/PortalInfo.cs
@@ -812,12 +812,7 @@ public void Fill(IDataReader dr)
                     ? p
                     : Security.FIPSCompliant.DecryptAES(p, Config.GetDecryptionkey(), Host.Host.GUID);
             }
-            catch (FormatException)
-            {
-                // for backward compatibility
-                ProcessorPassword = p;
-            }
-            catch(CryptographicException)
+            catch (Exception ex) when (ex is FormatException || ex is CryptographicException)
             {
                 // for backward compatibility
                 ProcessorPassword = p;