Elgato_dark/zeppelin
1
0
Fork 0
mirror of https://github.com/apache/zeppelin synced 2026-05-24 09:38:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

[ZEPPELIN-3092] Reset GitNotebookRepo to master

Browse source
This commit is contained in:
Mohamed Magdy 2017-12-08 19:03:28 +01:00
parent 6aa4ba7ddd
commit 3009abd47d
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/GitNotebookRepo.java
View file

@ -109,7 +109,7 @@ public class GitNotebookRepo extends VFSNotebookRepo {
*/
@Override
public synchronized Note get(String noteId, String revId, AuthenticationInfo subject)
throws IOException {
throws IOException {
Note note = null;
RevCommit stash = null;
try {
@ -134,7 +134,7 @@ public class GitNotebookRepo extends VFSNotebookRepo {
ObjectId dropped = git.stashDrop().setStashRef(0).call();
Collection<RevCommit> stashes = git.stashList().call();
LOG.debug("Stash applied as : {}, and dropped : {}, stash size: {}", applied, dropped,
stashes.size());
stashes.size());
}
} catch (GitAPIException e) {
LOG.error("Failed to return note from revision \"{}\"", revId, e);
@ -163,14 +163,14 @@ public class GitNotebookRepo extends VFSNotebookRepo {
@Override
public Note setNoteRevision(String noteId, String revId, AuthenticationInfo subject)
throws IOException {
throws IOException {
Note revisionNote = get(noteId, revId, subject);
if (revisionNote != null) {
save(revisionNote, subject);
}
return revisionNote;
}
@Override
public void close() {
git.getRepository().close();
@ -185,4 +185,4 @@ public class GitNotebookRepo extends VFSNotebookRepo {
this.git = git;
}
}
}