Browse Source

Merge changes Iad4d4127,I0211bcf0

* changes:
  Silence warning for non-translatable String in AddNoteCommand
  Use try-with-resources to fix warnings in AddNoteCommand
stable-4.1
Shawn Pearce 10 years ago committed by Gerrit Code Review @ Eclipse.org
parent
commit
481405f770
  1. 10
      org.eclipse.jgit/src/org/eclipse/jgit/api/AddNoteCommand.java

10
org.eclipse.jgit/src/org/eclipse/jgit/api/AddNoteCommand.java

@ -83,11 +83,10 @@ public class AddNoteCommand extends GitCommand<Note> {
public Note call() throws GitAPIException {
checkCallable();
RevWalk walk = new RevWalk(repo);
ObjectInserter inserter = repo.newObjectInserter();
NoteMap map = NoteMap.newEmptyMap();
RevCommit notesCommit = null;
try {
try (RevWalk walk = new RevWalk(repo);
ObjectInserter inserter = repo.newObjectInserter()) {
Ref ref = repo.getRef(notesRef);
// if we have a notes ref, use it
if (ref != null) {
@ -96,13 +95,10 @@ public class AddNoteCommand extends GitCommand<Note> {
}
map.set(id, message, inserter);
commitNoteMap(walk, map, notesCommit, inserter,
"Notes added by 'git notes add'");
"Notes added by 'git notes add'"); //$NON-NLS-1$
return map.getNote(id);
} catch (IOException e) {
throw new JGitInternalException(e.getMessage(), e);
} finally {
inserter.release();
walk.release();
}
}

Loading…
Cancel
Save