Add shutdown hook to cleanup unfinished clone when JVM is killed

Bug: 516303
Change-Id: I5181b0e8096af3537296848ac7dd74dff0b6d279
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/CloneCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/CloneCommand.java
index 63ca4289a06c863bbe75602f84a239537487eaea..a6ea66bc03fcb2b87f4a0546d01f5c735a6d3344 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/CloneCommand.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/CloneCommand.java
@@ -183,6 +183,8 @@ public class CloneCommand extends TransportCommand<CloneCommand, Git> {
                }
                Repository repository = null;
                FetchResult fetchResult = null;
+               Thread cleanupHook = new Thread(() -> cleanup());
+               Runtime.getRuntime().addShutdownHook(cleanupHook);
                try {
                        repository = init();
                        fetchResult = fetch(repository, u);
@@ -205,6 +207,8 @@ public class CloneCommand extends TransportCommand<CloneCommand, Git> {
                        }
                        cleanup();
                        throw e;
+               } finally {
+                       Runtime.getRuntime().removeShutdownHook(cleanupHook);
                }
                if (!noCheckout) {
                        try {