Merge pull request #181 from finos/db-contrib/develop

Db contrib/develop
finos · Sep 11, 2020 · 1849d5d · 1849d5d
2 parents 5bb8a74 + eef814f
commit 1849d5d
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/desktop/src/Plexus.Utils/BaseJsonFileRegistryProvider.cs b/desktop/src/Plexus.Utils/BaseJsonFileRegistryProvider.cs
@@ -116,24 +116,32 @@ private T LoadRegistry(string jsonFileName)
                 }
 
                 memoryStream.Position = 0;
-                var md5 = CalculateMd5(memoryStream);
+                var sha1 = CalculateSha1(memoryStream);
                 var creationTime = File.GetCreationTime(jsonFileName);
                 var lastWriteTime = File.GetLastWriteTime(jsonFileName);
                 var length = memoryStream.Length;
 
-                Log.Info($"Successfully loaded registry from {jsonFileName}. CreationTime: {creationTime}; LastWriteTime: {lastWriteTime}; Length: {length}; MD5: {md5}");
+                Log.Info($"Successfully loaded registry from {jsonFileName}. CreationTime: {creationTime}; LastWriteTime: {lastWriteTime}; Length: {length}; SHA1: {sha1}");
 
                 return registry;
             }
         }
 
 
-        private string CalculateMd5(Stream stream)
+        private string CalculateSha1(Stream stream)
         {
-            using (var md5 = MD5.Create())
+            try
+            {
+                using (var sha1 = SHA1.Create())
+                {
+                    var hash = sha1.ComputeHash(stream);
+                    return ToHashString(hash);
+                }
+            }
+            catch (Exception ex)
             {
-                var hash = md5.ComputeHash(stream);
-                return ToHashString(hash);
+                Log.Warn(ex, "Failed to calculate SHA1 hash");
+                return string.Empty;
             }
         }