activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject activemq-artemis git commit: NO-JIRA: Parse System properties first
Date Tue, 26 Sep 2017 20:49:28 GMT
Repository: activemq-artemis
Updated Branches:
  refs/heads/master f2f6fe250 -> b2c5cb06e


NO-JIRA: Parse System properties first


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/b2c5cb06
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/b2c5cb06
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/b2c5cb06

Branch: refs/heads/master
Commit: b2c5cb06ec02e609102e9434d0dd4d5bb47e649e
Parents: f2f6fe2
Author: Clebert Suconic <clebertsuconic@apache.org>
Authored: Tue Sep 26 16:49:17 2017 -0400
Committer: Clebert Suconic <clebertsuconic@apache.org>
Committed: Tue Sep 26 16:49:17 2017 -0400

----------------------------------------------------------------------
 .../activemq/artemis/core/server/impl/ActiveMQServerImpl.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b2c5cb06/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
index d932639..4cca7ba 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
@@ -504,6 +504,8 @@ public class ActiveMQServerImpl implements ActiveMQServer {
          return;
       }
 
+      configuration.parseSystemProperties();
+
       /** Calling this for cases where the server was stopped and now is being restarted...
failback, etc...*/
       this.analyzer.clear();
 
@@ -603,8 +605,6 @@ public class ActiveMQServerImpl implements ActiveMQServer {
 
       this.getCriticalAnalyzer().addAction(criticalAction);
 
-      configuration.parseSystemProperties();
-
       startDate = new Date();
 
       state = SERVER_STATE.STARTING;


Mime
View raw message