Simplify disposal of some resources

1 files changed, 4 insertions, 23 deletions

diff --git a/LibGit2Sharp/Diff.cs b/LibGit2Sharp/Diff.cs
index b276ebc3..6f0191e7 100644
--- a/LibGit2Sharp/Diff.cs
+++ b/LibGit2Sharp/Diff.cs
@@ -292,23 +292,12 @@ namespace LibGit2Sharp
         {
             TreeComparisonHandleRetriever comparisonHandleRetriever = (oh, nh, o) =>
             {
-                DiffSafeHandle diff = null, diff2 = null;
+                DiffSafeHandle diff = Proxy.git_diff_tree_to_index(repo.Handle, repo.Index.Handle, oh, o);
 
-                try
+                using (DiffSafeHandle diff2 = Proxy.git_diff_index_to_workdir(repo.Handle, repo.Index.Handle, o))
                 {
-                    diff = Proxy.git_diff_tree_to_index(repo.Handle, repo.Index.Handle, oh, o);
-                    diff2 = Proxy.git_diff_index_to_workdir(repo.Handle, repo.Index.Handle, o);
                     Proxy.git_diff_merge(diff, diff2);
                 }
-                catch
-                {
-                    diff.SafeDispose();
-                    throw;
-                }
-                finally
-                {
-                    diff2.SafeDispose();
-                }
 
                 return diff;
             };
@@ -332,17 +321,9 @@ namespace LibGit2Sharp
             {
                 var diffList = comparisonHandleRetriever(oldTreeId, newTreeId, options);
 
-                try
-                {
-                    if (explicitPathsOptions != null)
-                    {
-                        DispatchUnmatchedPaths(explicitPathsOptions, filePaths, matchedPaths);
-                    }
-                }
-                catch
+                if (explicitPathsOptions != null)
                 {
-                    diffList.Dispose();
-                    throw;
+                    DispatchUnmatchedPaths(explicitPathsOptions, filePaths, matchedPaths);
                 }
 
                 DetectRenames(diffList, compareOptions);