428859 patches from quickstart branch

2 files changed, 12 insertions, 6 deletions

diff --git a/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/ContainerInitializer.java b/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/ContainerInitializer.java
index 5edb826a69..66b4ddccc0 100644
--- a/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/ContainerInitializer.java
+++ b/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/ContainerInitializer.java
@@ -147,12 +147,17 @@ public class ContainerInitializer
             }
         }
     }
-    
+
     public String toString()
     {
-    	List<String> interested = new ArrayList<>(_interestedTypes.length);
-    	for (Class<?> c : _interestedTypes)
-    		interested.add(c.getName());
+        List<String> interested = Collections.emptyList();
+        if (_interestedTypes != null)
+        {
+            interested = new ArrayList<>(_interestedTypes.length);
+            for (Class<?> c : _interestedTypes)
+                interested.add(c.getName());
+        }
+
     	return String.format("ContainerInitializer{%s,interested=%s,applicable=%s,annotated=%s}",_target.getClass().getName(),interested,_applicableTypeNames,_annotatedTypeNames);
     }
 
diff --git a/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlAppendable.java b/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlAppendable.java
index 0ab2401388..5a11c7505c 100644
--- a/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlAppendable.java
+++ b/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlAppendable.java
@@ -156,8 +156,9 @@ public class XmlAppendable
         }
     }
     
-    public Stack<String> getOpenTags()
+    public void literal(String xml) throws IOException
     {
-        return (Stack<String>)_tags.clone();
+        _out.append(xml);
     }
+
 }