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

447216 putAll Properties in XmlConfiguration

This commit is contained in:
Greg Wilkins 2014-10-15 18:28:46 +11:00
parent d82809d2f1
commit ea64d32214
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1199,14 +1199,9 @@ public class XmlConfiguration
// If no start.config properties, use clean slate
if (properties == null)
{
properties = new Properties();
// Add System Properties
Enumeration<?> ensysprop = System.getProperties().propertyNames();
while (ensysprop.hasMoreElements())
{
String name = (String)ensysprop.nextElement();
properties.put(name,System.getProperty(name));
}
properties = new Properties();
properties.putAll(System.getProperties());
}
// For all arguments, load properties