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 ++-----------
 1 files changed, 2 insertions(+), 11 deletions(-)

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;
 

--
Gitblit v1.10.0