commit 7aeed262139b72b7eb698f215f4a120521b1c9eb
author Shawn Pearce <sop@google.com> Tue Nov 19 04:37:48 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 19 04:37:48 2013 +0000
tree 6b07be5ad4e0b4655cf649174554c99fd0fb9471
parent 5cefcbfc68a8d7b49d1d98d36c5dfbb09de28923
parent 9dff074c73ba59f17d8e0430cae04b5a6d1ac32c

Merge "Fix updating changes that fail to merge" into stable-2.8

gerrit-server/src/main/java/com/google/gerrit/server/git/GarbageCollection.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/GarbageCollection.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/GarbageCollection.java
index 685e87c..24af14d 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/GarbageCollection.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/GarbageCollection.java
@@ -21,8 +21,6 @@
 
 import org.eclipse.jgit.api.GarbageCollectCommand;
 import org.eclipse.jgit.api.Git;
-import org.eclipse.jgit.api.errors.GitAPIException;
-import org.eclipse.jgit.api.errors.JGitInternalException;
 import org.eclipse.jgit.errors.RepositoryNotFoundException;
 import org.eclipse.jgit.lib.Config;
 import org.eclipse.jgit.lib.ConfigConstants;
@@ -33,7 +31,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.List;
 import java.util.Properties;
@@ -91,15 +88,7 @@
         result.addError(new GarbageCollectionResult.Error(
             GarbageCollectionResult.Error.Type.REPOSITORY_NOT_FOUND,
             p));
-      } catch (IOException e) {
-        logGcError(writer, p, e);
-        result.addError(new GarbageCollectionResult.Error(
-            GarbageCollectionResult.Error.Type.GC_FAILED, p));
-      } catch (GitAPIException e) {
-        logGcError(writer, p, e);
-        result.addError(new GarbageCollectionResult.Error(
-            GarbageCollectionResult.Error.Type.GC_FAILED, p));
-      } catch (JGitInternalException e) {
+      } catch (Exception e) {
         logGcError(writer, p, e);
         result.addError(new GarbageCollectionResult.Error(
             GarbageCollectionResult.Error.Type.GC_FAILED, p));