[jboss-cvs] JBossAS SVN: r83645 - projects/bootstrap/trunk/src/main/java/org/jboss/bootstrap.

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

Author: ALRubinger
Date: 2009-01-30 02:52:51 -0500 (Fri, 30 Jan 2009)
New Revision: 83645

Modified:
   projects/bootstrap/trunk/src/main/java/org/jboss/bootstrap/BaseServerConfig.java
Log:
[JBBOOT-6] First consult internal props in BaseServerConfig.getServerNativeDir

Modified: projects/bootstrap/trunk/src/main/java/org/jboss/bootstrap/BaseServerConfig.java
===================================================================
--- projects/bootstrap/trunk/src/main/java/org/jboss/bootstrap/BaseServerConfig.java	2009-01-30 07:52:10 UTC (rev 83644)
+++ projects/bootstrap/trunk/src/main/java/org/jboss/bootstrap/BaseServerConfig.java	2009-01-30 07:52:51 UTC (rev 83645)
@@ -390,7 +390,8 @@
     */
    String getNativeDirProperty()
    {
-      return System.getProperty(NATIVE_DIR_PROPERTY);
+      String property = this.props.getProperty(NATIVE_DIR_PROPERTY);
+      return property != null ? property : System.getProperty(NATIVE_DIR_PROPERTY);
    }
 
    /**