Fix #591: overriding property from command line

deploy/lib/server_config.rb

@@ -2556,9 +2556,9 @@ def ServerConfig.properties(prop_file_location = @@path)
 
     properties.merge!(ServerConfig.load_properties(env_properties_file, "ml.")) if File.exists? env_properties_file
 
-    properties = ServerConfig.substitute_properties(properties, properties, "ml.")
-
     properties = load_prop_from_args(properties)
+
+    properties = ServerConfig.substitute_properties(properties, properties, "ml.")
   end
 
 end

deploy/test/data/ml7-properties/build.properties

@@ -147,3 +147,5 @@ local-server=localhost
 #cert-server=
 #prod-server=
 yoda-age=
+dummy-port=9999
+dummy2-port=${dummy-port}

deploy/test/test_server_config.rb

@@ -188,6 +188,24 @@
 
   end
 
+  # issue #591
+  describe "override properties from command" do
+
+    before do
+      ARGV << "--ml.dummy-port=8888"
+      @properties = ServerConfig.properties(File.expand_path("../data/ml7-properties/", __FILE__))
+    end
+
+    it "should load valid properites from a command" do
+      @properties['ml.dummy-port'].must_equal '8888'
+      @properties['ml.dummy2-port'].must_equal '8888'
+    end
+
+    after do
+      ARGV.shift
+      ARGV.shift
+    end
+  end
 
   def with_stdin
     stdin = $stdin             # remember $stdin