Merge pull request jenkinsci#116 from hamaron/hotfix/crumbissuer

khmarbaise · khmarbaise · commit 86265e5d411b · 2015-12-06T19:32:10.000+01:00
jenkinsci#39: Don't propagate IOException when GET for /CrumbIssuer fails.
diff --git a/src/main/java/com/offbytwo/jenkins/client/JenkinsHttpClient.java b/src/main/java/com/offbytwo/jenkins/client/JenkinsHttpClient.java
@@ -171,6 +171,26 @@ public String get(String path) throws IOException {
         }
     }
 
+    /**
+     * Perform a GET request and parse the response to the given class,
+     * logging any IOException that is thrown rather than propagating it.
+     *
+     * @param path path to request, can be relative or absolute
+     * @param cls class of the response
+     * @param <T> type of the response
+     * @return an instance of the supplied class
+     */
+    public <T extends BaseModel> T getQuietly(String path, Class<T> cls) {
+        T value;
+        try {
+            value = get(path, cls);
+            return value;
+        } catch (IOException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
     /**
      * Perform a GET request and return the response as InputStream
      *
@@ -203,7 +223,7 @@ public <R extends BaseModel, D> R post(String path, D data, Class<R> cls) throws
     public <R extends BaseModel, D> R post(String path, D data, Class<R> cls, boolean crumbFlag) throws IOException {
         HttpPost request = new HttpPost(api(path));
         if (crumbFlag == true) {
-            Crumb crumb = get("/crumbIssuer", Crumb.class);
+            Crumb crumb = getQuietly("/crumbIssuer", Crumb.class);
             if (crumb != null) {
                 request.addHeader(new BasicHeader(crumb.getCrumbRequestField(), crumb.getCrumb()));
             }
@@ -303,7 +323,7 @@ public String post_xml(String path, String xml_data) throws IOException {
     public String post_xml(String path, String xml_data, boolean crumbFlag) throws IOException {
         HttpPost request = new HttpPost(api(path));
         if (crumbFlag == true) {
-            Crumb crumb = get("/crumbIssuer", Crumb.class);
+            Crumb crumb = getQuietly("/crumbIssuer", Crumb.class);
             if (crumb != null) {
                 request.addHeader(new BasicHeader(crumb.getCrumbRequestField(), crumb.getCrumb()));
             }
