[jboss-cvs] JBossAS SVN: r87708 - in projects/bootstrap/trunk/impl-as/src: test/java/org/jboss/bootstrap/impl/as/config and 1 other directory.

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

Author: ALRubinger
Date: 2009-04-23 02:49:24 -0400 (Thu, 23 Apr 2009)
New Revision: 87708

Modified:
   projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/config/JBossASConfigurationInitializerImpl.java
   projects/bootstrap/trunk/impl-as/src/test/java/org/jboss/bootstrap/impl/as/config/JBossASConfigurationInitializationTestCase.java
Log:
[JBBOOT-31] Correct for JBOSS_HOME in env var w/ no trailing slash

Modified: projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/config/JBossASConfigurationInitializerImpl.java
===================================================================
--- projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/config/JBossASConfigurationInitializerImpl.java	2009-04-23 06:32:52 UTC (rev 87707)
+++ projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/config/JBossASConfigurationInitializerImpl.java	2009-04-23 06:49:24 UTC (rev 87708)
@@ -78,8 +78,13 @@
       // $JBOSS_HOME
       final String pwd = FILE_PRESENT_WORKING_DIRECTORY.getAbsolutePath() + "/";
       final String currentJBossHome = config.getJBossHome() != null ? config.getJBossHome().toExternalForm() : null;
-      final String jbossHome = this.resolvePropertyValue(JBossASServerConfig.PROP_KEY_JBOSSAS_HOME,
+      String jbossHome = this.resolvePropertyValue(JBossASServerConfig.PROP_KEY_JBOSSAS_HOME,
             JBossASServerConfig.ENV_VAR_JBOSSAS_HOME, currentJBossHome, pwd, configProps);
+      final String trailingSlash = "/";
+      if (!jbossHome.endsWith(trailingSlash))
+      {
+         jbossHome = jbossHome + trailingSlash;
+      }
       config.jbossHome(jbossHome);
 
       // ${jboss.bind.address}

Modified: projects/bootstrap/trunk/impl-as/src/test/java/org/jboss/bootstrap/impl/as/config/JBossASConfigurationInitializationTestCase.java
===================================================================
--- projects/bootstrap/trunk/impl-as/src/test/java/org/jboss/bootstrap/impl/as/config/JBossASConfigurationInitializationTestCase.java	2009-04-23 06:32:52 UTC (rev 87707)
+++ projects/bootstrap/trunk/impl-as/src/test/java/org/jboss/bootstrap/impl/as/config/JBossASConfigurationInitializationTestCase.java	2009-04-23 06:49:24 UTC (rev 87708)
@@ -227,6 +227,11 @@
          log.warn("This test cannot account for true defaults of JBoss Home, unset environment variable "
                + envVarJBossHomeName);
          jbossHome = new File(jbossHomeFromEnvVar).toURI().toURL().toExternalForm();
+         final String trailingSlash = "/";
+         if (!jbossHome.endsWith(trailingSlash))
+         {
+            jbossHome = jbossHome + trailingSlash;
+         }
       }
       return jbossHome;
    }