Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2013-09-05 23:47:36 +0000
committerGreg Wilkins2013-09-05 23:47:36 +0000
commit9e90e1267fba23e897fb414dbf9811075542c449 (patch)
tree559d87719dc611dcfaffd326744ea172005279ff
parent178c38cc35f821d8149f62507a95d6407612ef8f (diff)
downloadorg.eclipse.jetty.project-9e90e1267fba23e897fb414dbf9811075542c449.tar.gz
org.eclipse.jetty.project-9e90e1267fba23e897fb414dbf9811075542c449.tar.xz
org.eclipse.jetty.project-9e90e1267fba23e897fb414dbf9811075542c449.zip
fixed bad merge
-rw-r--r--jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java3
-rw-r--r--jetty-xml/src/test/java/org/eclipse/jetty/xml/TestConfiguration.java4
-rw-r--r--jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java1
3 files changed, 6 insertions, 2 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 67fe092ce1..a6b93fd5dd 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
@@ -810,7 +810,8 @@ public class XmlConfiguration
{
throw new IllegalStateException("No suitable constructor: " + node + " on " + obj);
}
-
+
+ _configuration.initializeDefaults(n);
configure(n,node,argIndex);
return n;
}
diff --git a/jetty-xml/src/test/java/org/eclipse/jetty/xml/TestConfiguration.java b/jetty-xml/src/test/java/org/eclipse/jetty/xml/TestConfiguration.java
index 19492cd797..37fa1785ae 100644
--- a/jetty-xml/src/test/java/org/eclipse/jetty/xml/TestConfiguration.java
+++ b/jetty-xml/src/test/java/org/eclipse/jetty/xml/TestConfiguration.java
@@ -34,6 +34,8 @@ public class TestConfiguration extends HashMap<String,Object>
{
public static int VALUE=77;
+ public final Object ID = new Object();
+
public final String name;
public TestConfiguration nested;
public String testString="default";
@@ -107,7 +109,6 @@ public class TestConfiguration extends HashMap<String,Object>
public TestConfiguration call(Boolean b)
{
- nested=new TestConfiguration("called-"+name);
nested.put("Arg",b);
return nested;
}
@@ -187,4 +188,5 @@ public class TestConfiguration extends HashMap<String,Object>
{
this.map = map;
}
+
}
diff --git a/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java b/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java
index 561d406c2d..929a980e37 100644
--- a/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java
+++ b/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java
@@ -147,6 +147,7 @@ public class XmlConfigurationTest
TestConfiguration tc = (TestConfiguration)configuration.configure();
assertEquals(3,count.get());
+
assertEquals("NEW DEFAULT",tc.getTestString());
assertEquals("nested",tc.getNested().getTestString());
assertEquals("NEW DEFAULT",tc.getNested().getNested().getTestString());

Back to the top