From 3f03092522f3d20fadd86e3581137cf0c98aa862 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Thu, 29 Oct 2009 15:17:32 +0000
Subject: [PATCH] Be consistent with the other command-lines in the default host name proposed for the host name.
---
opends/src/quicksetup/org/opends/quicksetup/UserData.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/UserData.java b/opends/src/quicksetup/org/opends/quicksetup/UserData.java
index 03f8833..ae7d42a 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/UserData.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/UserData.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008 Sun Microsystems, Inc.
+ * Copyright 2008-2009 Sun Microsystems, Inc.
*/
package org.opends.quicksetup;
@@ -96,6 +96,8 @@
private String configurationClass;
+ private static String defaultHostName;
+
/**
* Creates a user data object with default values.
*/
@@ -677,15 +679,18 @@
*/
public static String getDefaultHostName()
{
- String name = "";
- try
+ if (defaultHostName == null)
{
- name = java.net.InetAddress.getLocalHost().getCanonicalHostName();
+ try
+ {
+ defaultHostName = java.net.InetAddress.getLocalHost().getHostName();
+ }
+ catch (Throwable t)
+ {
+ defaultHostName = "localhost";
+ }
}
- catch (Throwable t)
- {
- }
- return name;
+ return defaultHostName;
}
/**
--
Gitblit v1.10.0