System property should have higher priority than env option

Signed-off-by: David Matějček <[email protected]>

nucleus/common/glassfish-jdk-extensions/src/main/java/org/glassfish/main/jdke/props/EnvToPropsConverter.java

@@ -44,8 +44,8 @@ public EnvToPropsConverter(final Path relativePathAnchor) {
     /**
      * Tries to resolve given keys.
      * <ul>
-     * <li>First tries {@link System#getenv(String)} using map key.
-     * <li>Then tries {@link System#getProperty(String)} using map value.
+     * <li>First tries {@link System#getProperty(String)} using map value.
+     * <li>Then tries {@link System#getenv(String)} using map key.
      * </ul>
      * Then if the retrieved value is relative, it is resolved against the anchor path from
      * constructor.
@@ -74,8 +74,8 @@ public Map<String, File> convert(final Map<String, String> envToSys) {
     /**
      * Tries to resolve given keys.
      * <ul>
-     * <li>First tries {@link System#getenv(String)} using the first parameter.
-     * <li>Then tries {@link System#getProperty(String)} using the second parameter.
+     * <li>First tries {@link System#getProperty(String)} using the second parameter.
+     * <li>Then tries {@link System#getenv(String)} using the first parameter.
      * </ul>
      * Then if the retrieved value is relative, it is resolved against the anchor path from
      * constructor.
@@ -91,14 +91,14 @@ public File convert(final String envPropertyName, final String systemPropertyNam
 
 
     private String evaluate(final String envPropertyName, final String systemPropertyName) {
-        final String envValue = System.getenv(envPropertyName);
-        if (envValue != null) {
-            return envValue;
-        }
         final String sysValue = System.getProperty(systemPropertyName);
         if (sysValue != null) {
             return sysValue;
         }
+        final String envValue = System.getenv(envPropertyName);
+        if (envValue != null) {
+            return envValue;
+        }
 //        System.err.println("Missing env " + envPropertyName + " or system property " + systemPropertyName);
         return null;
     }