commit 619a2a84578e9abdb6080256247972e0d1946f14
author Luca Milanesio <luca.milanesio@gmail.com> Thu Jun 19 07:31:06 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 17 02:46:03 2014 +0000
tree afea268885924d60bc5c64e7353d2c987f9807e7
parent 20c39ab6abda1597c633190d668dda49a2c272ab
parent d7299f2c6bdac61a2657d6eb587f922a31e8c939

Merge "Debug of ALL exception during pull request import"

github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/PullRequestImportJob.java

diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/PullRequestImportJob.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/PullRequestImportJob.java
index 0e941af..9e007f8 100644
--- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/PullRequestImportJob.java
+++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/PullRequestImportJob.java
@@ -153,10 +153,10 @@
       } catch (OrmException e1) {
         LOG.error("Error rolling back transation", e1);
       }
-    } catch (Exception e) {
+    } catch (Throwable e) {
       LOG.error("Pull request " + prId + " into repository " + organisation
           + "/" + repoName + " was failed", e);
-      status.update(GitJobStatus.Code.FAILED, "Failed", getErrorDescription(e));
+      status.update(GitJobStatus.Code.FAILED, "Failed",  e.getLocalizedMessage());
       try {
         db.rollback();
       } catch (OrmException e1) {
@@ -167,10 +167,6 @@
     }
   }
 
-  private String getErrorDescription(Exception e) {
-    return e.getLocalizedMessage();
-  }
-
   private List<Id> addPullRequestToChange(ReviewDb db, GHPullRequest pr,
       Repository gitRepo) throws Exception {
     String destinationBranch = pr.getBase().getRef();