Merge pull request #325 from MCMicS/bug/322

closes #322 Nullpointer if Jenkins if not running
MCMicS · Sep 26, 2021 · 7b06d08 · 7b06d08
2 parents 0fc3c62 + 554d5d6
commit 7b06d08
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/main/java/org/codinjutsu/tools/jenkins/logic/JenkinsBackgroundTask.java b/src/main/java/org/codinjutsu/tools/jenkins/logic/JenkinsBackgroundTask.java
@@ -38,6 +38,7 @@ public void run(@NotNull ProgressIndicator progressIndicator) {
             jenkinsTask.run(requestManager);
         } catch (JenkinsPluginRuntimeException jenkinsPluginRuntimeException) {
             handleJenkinsPluginException(jenkinsPluginRuntimeException);
+            throw jenkinsPluginRuntimeException;
         }
     }
 
@@ -68,7 +69,9 @@ public void onSuccess() {
     @Override
     public void onThrowable(@NotNull Throwable error) {
         try {
-            super.onThrowable(error);
+            if (!(error instanceof JenkinsPluginRuntimeException)) {
+                super.onThrowable(error);
+            }
             jenkinsTask.onThrowable(error);
         } catch (JenkinsPluginRuntimeException jenkinsPluginRuntimeException) {
             handleJenkinsPluginException(jenkinsPluginRuntimeException);

diff --git a/src/main/java/org/codinjutsu/tools/jenkins/logic/LoginService.java b/src/main/java/org/codinjutsu/tools/jenkins/logic/LoginService.java
@@ -42,8 +42,8 @@ public void run(@NotNull RequestManagerInterface requestManager) {
                             requestManager.authenticate(settings, jenkinsSettings);
                             jenkinsWorkspace = requestManager.loadJenkinsWorkspace(settings);
                         } catch (Exception ex) {
-                            publisher.loginFailed(ex);
                             publisher.loginCancelled();
+                            throw ex;
                         }
                     }