From 07f1fbb0fe4670e831032059c42e86554ccfe1bc Mon Sep 17 00:00:00 2001
From: kohsuke <kohsuke@71c3de6d-444a-0410-be80-ed276b4c234a>
Date: Mon, 23 Jun 2008 01:10:44 +0000
Subject: [PATCH] [FIXED HUDSON-1894] Add hyperlink to error message when
 showing UnknownHostException

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@10309 71c3de6d-444a-0410-be80-ed276b4c234a
---
 core/src/main/java/hudson/model/UpdateCenter.java         | 8 ++++++++
 .../model/UpdateCenter/ConnectionCheckJob/row.jelly       | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/hudson/model/UpdateCenter.java b/core/src/main/java/hudson/model/UpdateCenter.java
index 6aa9b4a122..b9e85aa36b 100644
--- a/core/src/main/java/hudson/model/UpdateCenter.java
+++ b/core/src/main/java/hudson/model/UpdateCenter.java
@@ -22,6 +22,7 @@ import java.io.InputStream;
 import java.io.ByteArrayOutputStream;
 import java.net.URL;
 import java.net.URLConnection;
+import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -366,11 +367,18 @@ public class UpdateCenter implements ModelObject {
                 testConnection(new URL("https://hudson.dev.java.net/?uctest"));
 
                 statuses.add("Success");
+            } catch (UnknownHostException e) {
+                statuses.add("<span class=error>Failed to resolve host name "+e.getMessage()+". Perhaps you need to <a href='../pluginManager/advanced'>configure HTTP proxy?</a></span>");
+                addStatus(e);
             } catch (IOException e) {
                 statuses.add(Functions.printThrowable(e));
             }
         }
 
+        private void addStatus(UnknownHostException e) {
+            statuses.add("<pre>"+ Functions.xmlEscape(Functions.printThrowable(e))+"</pre>");
+        }
+
         public String[] getStatuses() {
             synchronized (statuses) {
                 return statuses.toArray(new String[statuses.size()]);
diff --git a/core/src/main/resources/hudson/model/UpdateCenter/ConnectionCheckJob/row.jelly b/core/src/main/resources/hudson/model/UpdateCenter/ConnectionCheckJob/row.jelly
index e2cd85803b..93c31b1120 100644
--- a/core/src/main/resources/hudson/model/UpdateCenter/ConnectionCheckJob/row.jelly
+++ b/core/src/main/resources/hudson/model/UpdateCenter/ConnectionCheckJob/row.jelly
@@ -5,7 +5,7 @@
     <td id="prepStatus${size(statuses)}">
       <ul>
         <j:forEach var="s" items="${statuses}">
-          <li><pre>${s}</pre></li>
+          <li>${s}</li>
         </j:forEach>
       </ul>
     </td>
-- 
GitLab