You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2016/10/19 18:49:04 UTC
activemq-artemis git commit: NO-JIRA: just adding some javadoc on
ReloadManager
Repository: activemq-artemis
Updated Branches:
refs/heads/master 9899f5243 -> 813f2532d
NO-JIRA: just adding some javadoc on ReloadManager
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/813f2532
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/813f2532
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/813f2532
Branch: refs/heads/master
Commit: 813f2532d8c7ebcc71d09d4dad90043689f75074
Parents: 9899f52
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed Oct 19 14:46:38 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Oct 19 14:46:38 2016 -0400
----------------------------------------------------------------------
.../activemq/artemis/core/server/reload/ReloadManagerImpl.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/813f2532/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/reload/ReloadManagerImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/reload/ReloadManagerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/reload/ReloadManagerImpl.java
index 2ff04f4..8dfc3fe 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/reload/ReloadManagerImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/reload/ReloadManagerImpl.java
@@ -93,7 +93,9 @@ public class ReloadManagerImpl extends ActiveMQScheduledComponent implements Rel
ReloadRegistry(URL uri) {
try {
- file = new File(uri.toURI());//"file:etc/artemis.xml"
+ file = new File(uri.toURI()); // artemis-features will have this as "file:etc/artemis.xml"
+ // so, we need to make sure we catch the exception and try
+ // a simple path as it will be a relative path
} catch (Exception e) {
logger.debug(e.getMessage(), e);
file = new File(uri.getPath());