From 63f1bcbd0af8b192232030ffd49bf9dc0a89c8a0 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Mon, 23 Nov 2009 16:52:20 +0000
Subject: [PATCH] Fix for issue 4364 (control-panel occasionally freezes Ubuntu 9.10).
---
opends/src/guitools/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java | 13 ++-----------
opends/src/guitools/org/opends/guitools/controlpanel/task/Task.java | 16 ++--------------
opends/src/guitools/org/opends/guitools/controlpanel/datamodel/ConnectionHandlersMonitoringTableModel.java | 7 ++-----
3 files changed, 6 insertions(+), 30 deletions(-)
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/ConnectionHandlersMonitoringTableModel.java b/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/ConnectionHandlersMonitoringTableModel.java
index 7de4382..c82e090 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/ConnectionHandlersMonitoringTableModel.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/ConnectionHandlersMonitoringTableModel.java
@@ -163,7 +163,7 @@
{
if (ach.getAddress() != null)
{
- sb.append(ach.getAddress().getHostName()+":"+ch.getPort());
+ sb.append(ach.getAddress().getHostAddress()+":"+ch.getPort());
}
else
{
@@ -201,10 +201,7 @@
{
if (cn.endsWith(
" "+address.getHostAddress()+" port "+cch.getPort()+
- " Statistics") ||
- cn.endsWith(
- " "+address.getHostName()+" port "+cch.getPort()+
- " Statistics"))
+ " Statistics"))
{
monitoringEntry = sr;
break;
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java b/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java
index 47901a7..3aee88e 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java
@@ -41,6 +41,7 @@
import org.opends.guitools.controlpanel.util.ConfigFromDirContext;
import org.opends.guitools.controlpanel.util.Utilities;
+import org.opends.quicksetup.UserData;
import org.opends.server.tools.tasks.TaskEntry;
import org.opends.server.types.AttributeType;
import org.opends.server.types.DN;
@@ -88,17 +89,7 @@
private boolean isAuthenticated;
- private static String localHostName = "locahost";
- static
- {
- try
- {
- localHostName = java.net.InetAddress.getLocalHost().getHostName();
- }
- catch (Throwable t)
- {
- }
- };
+ private static String localHostName = UserData.getDefaultHostName();
private String hostName = localHostName;
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/task/Task.java b/opends/src/guitools/org/opends/guitools/controlpanel/task/Task.java
index 440ad62..77e1a72 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/task/Task.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/task/Task.java
@@ -54,6 +54,7 @@
import org.opends.guitools.controlpanel.util.Utilities;
import org.opends.messages.Message;
import org.opends.quicksetup.Installation;
+import org.opends.quicksetup.UserData;
import org.opends.server.types.ByteString;
import org.opends.server.types.DN;
import org.opends.server.types.Schema;
@@ -68,21 +69,8 @@
*/
public abstract class Task
{
- private static String localHostName = null;
+ private static String localHostName = UserData.getDefaultHostName();
private String binDir;
- static
- {
- // Do this since by default the hostname used by the connection is
- // 0.0.0.0, so try to figure the name of the host. This is used to
- // display the equivalent command-line.
- try
- {
- localHostName = java.net.InetAddress.getLocalHost().getHostName();
- }
- catch (Throwable t)
- {
- }
- }
/**
* The different task types.
*
--
Gitblit v1.10.0