[jboss-cvs] JBossAS SVN: r89229 - branches/Branch_5_x_BootstrapLegacyRemoval/main/src/main/org/jboss.

[jboss-cvs-commits at lists.jboss.org]

Author: ALRubinger
Date: 2009-05-20 19:52:01 -0400 (Wed, 20 May 2009)
New Revision: 89229

Modified:
   branches/Branch_5_x_BootstrapLegacyRemoval/main/src/main/org/jboss/Main.java
Log:
[JBAS-6856] Default the server name for the boot log directory

Modified: branches/Branch_5_x_BootstrapLegacyRemoval/main/src/main/org/jboss/Main.java
===================================================================
--- branches/Branch_5_x_BootstrapLegacyRemoval/main/src/main/org/jboss/Main.java	2009-05-20 23:28:20 UTC (rev 89228)
+++ branches/Branch_5_x_BootstrapLegacyRemoval/main/src/main/org/jboss/Main.java	2009-05-20 23:52:01 UTC (rev 89229)
@@ -267,7 +267,11 @@
        */
       final String sysPropBootLogDir = SYS_PROP_BOOT_LOG_DIR_NAME;
       final String sysPropLogDir = JBossASServerConfig.PROP_KEY_JBOSSAS_SERVER_LOG_DIR;
-      final String serverName = props.get(JBossASServerConfig.PROP_KEY_JBOSSAS_SERVER_NAME);
+      String serverName = props.get(JBossASServerConfig.PROP_KEY_JBOSSAS_SERVER_NAME);
+      if (serverName == null || serverName.length() == 0)
+      {
+         serverName = JBossASConfigurationInitializer.VALUE_SERVER_NAME_DEFAULT;
+      }
       final String manualBootLogDir = props.get(sysPropBootLogDir);
       final String manualLogDir = props.get(sysPropLogDir);
       // If nothing's been explicitly specified