From 06ec8c88556b02782c7b91a233de91eaf4a1439d Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Tue, 09 Jun 2009 12:28:05 +0000
Subject: [PATCH] Fix for issue 3550 (Consider making the control panel able to manage remote servers)
---
opends/src/guitools/org/opends/guitools/controlpanel/ui/BrowseGeneralMonitoringPanel.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/ui/BrowseGeneralMonitoringPanel.java b/opends/src/guitools/org/opends/guitools/controlpanel/ui/BrowseGeneralMonitoringPanel.java
index 9560bc5..581c8f7 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/ui/BrowseGeneralMonitoringPanel.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/ui/BrowseGeneralMonitoringPanel.java
@@ -369,6 +369,16 @@
displayErrorPane = true;
}
}
+ else if (status == ServerDescriptor.ServerStatus.NOT_CONNECTED_TO_REMOTE)
+ {
+ MessageBuilder mb = new MessageBuilder();
+ mb.append(INFO_CTRL_PANEL_CANNOT_CONNECT_TO_REMOTE_DETAILS.get(
+ server.getHostname()));
+ mb.append("<br><br>"+getAuthenticateHTML());
+ errorDetails = mb.toMessage();
+ errorTitle = INFO_CTRL_PANEL_CANNOT_CONNECT_TO_REMOTE_SUMMARY.get();
+ displayErrorPane = true;
+ }
else
{
errorTitle = INFO_CTRL_PANEL_SERVER_NOT_RUNNING_SUMMARY.get();
@@ -614,8 +624,11 @@
private String getServerName(ServerDescriptor server)
{
- String serverName = server.getHostname()+":"+
- server.getAdminConnector().getPort();
+ String serverName = server.getHostname();
+ if (server.getAdminConnector() != null)
+ {
+ serverName +=":"+server.getAdminConnector().getPort();
+ }
return serverName;
}
--
Gitblit v1.10.0