Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #3743 - Cleanup requested from PR 

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
This commit is contained in:
Joakim Erdfelt 2019-06-10 10:12:39 -05:00
parent ff43fd3de4
commit 59ce0ea0e3
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java
View File

@ -30,7 +30,6 @@ import java.lang.reflect.Method;
import java.lang.reflect.Modifier; import java.lang.reflect.Modifier;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.net.URI;
import java.net.URL; import java.net.URL;
import java.net.UnknownHostException; import java.net.UnknownHostException;
import java.nio.file.Path; import java.nio.file.Path;
@ -207,24 +206,14 @@ public class XmlConfiguration
* @param configuration the URL of the XML configuration * @param configuration the URL of the XML configuration
* @throws IOException if the configuration could not be read * @throws IOException if the configuration could not be read
* @throws SAXException if the configuration could not be parsed * @throws SAXException if the configuration could not be parsed
* @deprecated use {@link XmlConfiguration(Resource)} instead due to escaping issues
*/ */
@Deprecated
public XmlConfiguration(URL configuration) throws SAXException, IOException public XmlConfiguration(URL configuration) throws SAXException, IOException
{ {
this(Resource.newResource(configuration)); this(Resource.newResource(configuration));
} }
/**
* Reads and parses the XML configuration file.
*
* @param configuration the URI and location of the XML configuration
* @throws IOException if the configuration could not be read
* @throws SAXException if the configuration could not be parsed
*/
public XmlConfiguration(URI configuration) throws SAXException, IOException
{
this(Resource.newResource(configuration));
}
/** /**
* Reads and parses the XML configuration string. * Reads and parses the XML configuration string.
* *
@ -1569,7 +1558,7 @@ public class XmlConfiguration
if ("Env".equals(tag)) if ("Env".equals(tag))
return envObj(node); return envObj(node);
LOG.warn("Unknown value tag: " + node + " in " + this, new Throwable()); LOG.warn("Unknown value tag: " + node + " in " + _configuration, new Throwable());
return null; return null;
} }