You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2016/08/09 15:52:31 UTC
[1/2] activemq-artemis git commit: ARTEMIS-601 Fixing use of spaces
on the server and reloading
Repository: activemq-artemis
Updated Branches:
refs/heads/master 6b0c08901 -> d108d87cb
ARTEMIS-601 Fixing use of spaces on the server and reloading
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/754976f8
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/754976f8
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/754976f8
Branch: refs/heads/master
Commit: 754976f8c11b8bffd2f8c2bc2564dbb46d2c8f3e
Parents: 6b0c089
Author: Clebert Suconic <cl...@apache.org>
Authored: Tue Aug 9 11:42:26 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue Aug 9 11:43:04 2016 -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/754976f8/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 058b938..cc9ef1d 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
@@ -2358,7 +2358,7 @@ public class ActiveMQServerImpl implements ActiveMQServer {
}
- private final class ConfigurationFileReloader extends Thread {
+ private final class ConfigurationFileReloader implements Runnable {
long lastModified;
boolean first = true;
ActiveMQServer server;
@@ -2371,7 +2371,7 @@ public class ActiveMQServerImpl implements ActiveMQServer {
public void run() {
try {
URL url = server.getConfiguration().getConfigurationUrl();
- long currentLastModified = new File(url.toURI()).lastModified();
+ long currentLastModified = new File(url.getPath()).lastModified();
if (first) {
first = false;
lastModified = currentLastModified;
[2/2] activemq-artemis git commit: This closes #710
Posted by jb...@apache.org.
This closes #710
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/d108d87c
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/d108d87c
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/d108d87c
Branch: refs/heads/master
Commit: d108d87cb1625200d9775c88a4af61daa61e3cb5
Parents: 6b0c089 754976f
Author: jbertram <jb...@apache.org>
Authored: Tue Aug 9 10:51:53 2016 -0500
Committer: jbertram <jb...@apache.org>
Committed: Tue Aug 9 10:51:53 2016 -0500
----------------------------------------------------------------------
.../activemq/artemis/core/server/impl/ActiveMQServerImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------