You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2016/11/02 11:38:33 UTC

svn commit: r1767640 - /qpid/java/trunk/broker/src/main/java/org/apache/qpid/server/Main.java

Author: rgodfrey
Date: Wed Nov  2 11:38:33 2016
New Revision: 1767640

URL: http://svn.apache.org/viewvc?rev=1767640&view=rev
Log:
QPID-7486 : Fix QPID_HOME interpolation

Modified:
    qpid/java/trunk/broker/src/main/java/org/apache/qpid/server/Main.java

Modified: qpid/java/trunk/broker/src/main/java/org/apache/qpid/server/Main.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker/src/main/java/org/apache/qpid/server/Main.java?rev=1767640&r1=1767639&r2=1767640&view=diff
==============================================================================
--- qpid/java/trunk/broker/src/main/java/org/apache/qpid/server/Main.java (original)
+++ qpid/java/trunk/broker/src/main/java/org/apache/qpid/server/Main.java Wed Nov  2 11:38:33 2016
@@ -282,7 +282,7 @@ public class Main
             }
             else if(systemProperties.containsKey(PROPERTY_QPID_HOME))
             {
-                context.put(QPID_HOME_DIR, environment.get(PROPERTY_QPID_HOME));
+                context.put(QPID_HOME_DIR, systemProperties.getProperty(PROPERTY_QPID_HOME));
             }
             else if(environment.containsKey(PROPERTY_QPID_HOME))
             {



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org