From 47ce01caecb82d420aa496641acce7a1b0a928c4 Mon Sep 17 00:00:00 2001
From: "william.liangf" <william.liangf@1a56cb94-b969-4eaa-88fa-be21384802f2>
Date: Thu, 8 Dec 2011 08:22:25 +0000
Subject: [PATCH] =?UTF-8?q?DUBBO-91=20=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://code.alibabatech.com/svn/dubbo/trunk@589 1a56cb94-b969-4eaa-88fa-be21384802f2
---
 .../dubbo/registry/pages/RegisteredPageHandler.java       | 8 ++++----
 .../rpc/protocol/dubbo/page/ConnectionsPageHandler.java   | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/dubbo-registry/src/main/java/com/alibaba/dubbo/registry/pages/RegisteredPageHandler.java b/dubbo-registry/src/main/java/com/alibaba/dubbo/registry/pages/RegisteredPageHandler.java
index 78d6404e0..4c0607517 100644
--- a/dubbo-registry/src/main/java/com/alibaba/dubbo/registry/pages/RegisteredPageHandler.java
+++ b/dubbo-registry/src/main/java/com/alibaba/dubbo/registry/pages/RegisteredPageHandler.java
@@ -44,7 +44,8 @@ public class RegisteredPageHandler implements PageHandler {
         Registry registry = null;
         if (registries != null && registries.size() > 0) {
             if (registries.size() == 1) {
-                select.append(" &gt; " + registries.iterator().next().getUrl().getAddress());
+                registry = registries.iterator().next();
+                select.append(" &gt; " + registry.getUrl().getAddress());
             } else {
                 select.append(" &gt; <select onchange=\"window.location.href='connections.html?port=' + this.value;\">");
                 for (Registry r : registries) {
@@ -68,14 +69,13 @@ public class RegisteredPageHandler implements PageHandler {
             if (services != null && services.size() > 0) {
                 for (String u : services) {
                     List<String> row = new ArrayList<String>();
-                    row.add(URL.valueOf(u).getServiceName().replace("<", "&lt;").replace(">", "&gt;"));
-                    row.add(u.toString().replace("<", "&lt;").replace(">", "&gt;"));
+                    row.add(u.replace("<", "&lt;").replace(">", "&gt;"));
                     rows.add(row);
                 }
             }
         }
         return new Page("Registries" + select.toString() + " &gt; Registered", "Registered (" + rows.size() + ")",
-                new String[] { "Service:", "URL:" }, rows);
+                new String[] { "Service URL:" }, rows);
     }
 
 }
\ No newline at end of file
diff --git a/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/page/ConnectionsPageHandler.java b/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/page/ConnectionsPageHandler.java
index efb4d0631..76f838aab 100644
--- a/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/page/ConnectionsPageHandler.java
+++ b/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/page/ConnectionsPageHandler.java
@@ -46,7 +46,8 @@ public class ConnectionsPageHandler implements PageHandler {
         StringBuilder select = new StringBuilder();
         if (servers != null && servers.size() > 0) {
             if (servers.size() == 1) {
-                select.append(" &gt; " + servers.iterator().next().getUrl().getPort());
+                server = servers.iterator().next();
+                select.append(" &gt; " + server.getUrl().getPort());
             } else {
                 select.append(" &gt; <select onchange=\"window.location.href='connections.html?port=' + this.value;\">");
                 for (ExchangeServer s : servers) {
-- 
GitLab