Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java')
-rw-r--r--jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java b/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java
index 10b6e25bad..18d85eb20f 100644
--- a/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java
+++ b/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java
@@ -1214,6 +1214,11 @@ public class XmlConfiguration
{
if (arg.toLowerCase(Locale.ENGLISH).endsWith(".properties"))
properties.load(Resource.newResource(arg).getInputStream());
+ else if (arg.indexOf('=')>=0)
+ {
+ int i=arg.indexOf('=');
+ properties.put(arg.substring(0,i),arg.substring(i+1));
+ }
}
// For all arguments, parse XMLs
@@ -1221,7 +1226,7 @@ public class XmlConfiguration
Object[] obj = new Object[args.length];
for (int i = 0; i < args.length; i++)
{
- if (!args[i].toLowerCase(Locale.ENGLISH).endsWith(".properties"))
+ if (!args[i].toLowerCase(Locale.ENGLISH).endsWith(".properties") && (args[i].indexOf('=')<0))
{
XmlConfiguration configuration = new XmlConfiguration(Resource.newResource(args[i]).getURL());
if (last != null)

Back to the top