Quellcode durchsuchen

Remove unneeded catch block and null checks

The catched exception was just rethrown and the
null check of the locked dir cache was unneeded if
the assignment was done outside the try block.

Change-Id: If2ee1f3eff3849f8da51eab825057fc56e166a94
tags/v2.0.0.201206130900-r
Kevin Sawicki vor 12 Jahren
Ursprung
Commit
6f432673c1
1 geänderte Dateien mit 4 neuen und 12 gelöschten Zeilen
  1. 4
    12
      org.eclipse.jgit/src/org/eclipse/jgit/api/ResetCommand.java

+ 4
- 12
org.eclipse.jgit/src/org/eclipse/jgit/api/ResetCommand.java Datei anzeigen

@@ -312,35 +312,27 @@ public class ResetCommand extends GitCommand<Ref> {
}

private void resetIndex(RevCommit commit) throws IOException {
DirCache dc = null;
DirCache dc = repo.lockDirCache();
try {
dc = repo.lockDirCache();
dc.clear();
DirCacheBuilder dcb = dc.builder();
dcb.addTree(new byte[0], 0, repo.newObjectReader(),
commit.getTree());
dcb.commit();
} catch (IOException e) {
throw e;
} finally {
if (dc != null)
dc.unlock();
dc.unlock();
}
}

private void checkoutIndex(RevCommit commit) throws IOException {
DirCache dc = null;
DirCache dc = repo.lockDirCache();
try {
dc = repo.lockDirCache();
DirCacheCheckout checkout = new DirCacheCheckout(repo, dc,
commit.getTree());
checkout.setFailOnConflict(false);
checkout.checkout();
} catch (IOException e) {
throw e;
} finally {
if (dc != null)
dc.unlock();
dc.unlock();
}
}


Laden…
Abbrechen
Speichern