Fix non-SSL problems (need sleep...)

milgner · Mar 4, 2014 · 397de69 · 397de69
1 parent bf071cc
commit 397de69
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/redmine-server/src/main/java/com/marcusilgner/redcity/RedmineIssueFetcher.java b/redmine-server/src/main/java/com/marcusilgner/redcity/RedmineIssueFetcher.java
@@ -64,17 +64,15 @@ public IssueData fetch() {
     private InputStream fetchUrlWithRedmineHeader(String _url) throws IOException {
       try {
         HttpClient httpClient = new HttpClient();
-        org.apache.commons.httpclient.HttpURL url;
-        if (_url.toLowerCase().startsWith("https:")) {
-            url = new HttpsURL(_url);
-          if (ignoreSSL) {
-            Protocol easyhttps = new Protocol("https", new org.apache.commons.httpclient.contrib.ssl.EasySSLProtocolSocketFactory(), url.getPort());
-            httpClient.getHostConfiguration().setHost(url.getHost(), url.getPort(), easyhttps);
-          }
+        HttpMethod httpMethod = null;
+        if (_url.toLowerCase().startsWith("https:") && ignoreSSL) {
+          HttpsURL url = new HttpsURL(_url);
+          Protocol easyhttps = new Protocol("https", new org.apache.commons.httpclient.contrib.ssl.EasySSLProtocolSocketFactory(), url.getPort());
+          httpClient.getHostConfiguration().setHost(url.getHost(), url.getPort(), easyhttps);
+          httpMethod = new GetMethod(url.getPath());
         } else {
-            url = new HttpURL(_url);
+          httpMethod = new GetMethod(_url);
         }
-        HttpMethod httpMethod = new GetMethod(url.getPath());
         httpMethod.setRequestHeader("X-Redmine-API-Key", apiToken);
         httpClient.executeMethod(httpMethod);
         return httpMethod.getResponseBodyAsStream();