Merge pull request #773 from rruizGit/dev/rruiz/pr772

Handle FileNotFoundException thrown while deserializing exceptions
microsoft · Mar 3, 2022 · 190520a · 190520a
2 parents 99d5c32 + 81b738e
commit 190520a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/StreamJsonRpc/JsonRpc.cs b/src/StreamJsonRpc/JsonRpc.cs
@@ -1219,7 +1219,7 @@ internal void AddLocalRpcMethod(MethodInfo handler, object? target, JsonRpcMetho
                 {
                     typeDeclaringAssembly = Assembly.Load(assemblyName);
                 }
-                catch (FileLoadException)
+                catch (Exception ex) when (ex is FileNotFoundException or FileLoadException)
                 {
                     // Try removing the version from the AssemblyName and try again, in case the message came from a newer version.
                     var an = new AssemblyName(assemblyName);
@@ -1230,7 +1230,7 @@ internal void AddLocalRpcMethod(MethodInfo handler, object? target, JsonRpcMetho
                         {
                             typeDeclaringAssembly = Assembly.Load(an.FullName);
                         }
-                        catch (FileLoadException)
+                        catch (Exception exRedux) when (exRedux is FileNotFoundException or FileLoadException)
                         {
                             // If we fail again, we'll just try to load the exception type from the AppDomain without an assembly's context.
                         }