From bf7be6071db77306939f60ef25b2ad4772ad27e8 Mon Sep 17 00:00:00 2001 From: Shane Kilkelly Date: Thu, 13 Dec 2018 11:41:07 +0000 Subject: [PATCH] Handle GitUserException, with multiple lines of output --- .../ac/ic/wlgitbridge/git/handler/WLRepositoryResolver.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/git/handler/WLRepositoryResolver.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/git/handler/WLRepositoryResolver.java index 6108078314..f935605af7 100644 --- a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/git/handler/WLRepositoryResolver.java +++ b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/git/handler/WLRepositoryResolver.java @@ -98,8 +98,6 @@ public class WLRepositoryResolver } catch (ServiceNotEnabledException e) { cannot occur */ - } catch (MissingRepositoryException e) { - throw new ServiceMayNotContinueException(String.join("\n", e.getDescriptionLines()), e); } catch (ServiceMayNotContinueException e) { /* Such as FailedConnectionException */ throw e; @@ -112,7 +110,7 @@ public class WLRepositoryResolver } catch (ForbiddenException e) { throw new ServiceNotAuthorizedException(); } catch (GitUserException e) { - throw new ServiceMayNotContinueException(e.getMessage(), e); + throw new ServiceMayNotContinueException(String.join("\n", e.getDescriptionLines()), e); } catch (IOException e) { Log.warn( "IOException when trying to open repo: " + projName,