[activemq-artemis] branch master updated: ARTEMIS-2342 Use a URL instead of a URI for the logging.configuration property

[clebertsuconic]

This is an automated email from the ASF dual-hosted git repository.

clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/master by this push:
     new 4fffc02  ARTEMIS-2342 Use a URL instead of a URI for the 
logging.configuration property
     new 1d0b5c3  This closes #2672
4fffc02 is described below

commit 4fffc0277835815699f2a740910175683155df78
Author: James Perkins <jperk...@redhat.com>
AuthorDate: Thu May 16 14:07:25 2019 -0700

    ARTEMIS-2342 Use a URL instead of a URI for the logging.configuration 
property
    
    The property the log manager itself expects is a URL which could result in 
an invalid URI missing the // prefix after file:.
---
 .../apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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 a4766ef..63508a2 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
@@ -23,7 +23,6 @@ import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.lang.management.ManagementFactory;
-import java.net.URI;
 import java.net.URL;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
@@ -2772,7 +2771,7 @@ public class ActiveMQServerImpl implements ActiveMQServer 
{
 
       if (System.getProperty("logging.configuration") != null) {
          try {
-            reloadManager.addCallback(new 
URI(System.getProperty("logging.configuration")).toURL(), new 
LoggingConfigurationFileReloader());
+            reloadManager.addCallback(new 
URL(System.getProperty("logging.configuration")), new 
LoggingConfigurationFileReloader());
          } catch (Exception e) {
             // a syntax error with the logging system property shouldn't 
prevent the server from starting
             
ActiveMQServerLogger.LOGGER.problemAddingConfigReloadCallback(System.getProperty("logging.configuration"),
 e);