From 6e0f8b505e3d72a5ce04c8a3972de2b563a239c8 Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Mon, 24 Feb 2014 14:29:01 +1100 Subject: [PATCH] 428859 patches from quickstart branch --- .../jetty/plus/annotation/ContainerInitializer.java | 13 +++++++++---- .../java/org/eclipse/jetty/xml/XmlAppendable.java | 5 +++-- 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 5edb826a69d..66b4ddccc0a 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 interested = new ArrayList<>(_interestedTypes.length); - for (Class c : _interestedTypes) - interested.add(c.getName()); + List 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 0ab24013889..5a11c7505cd 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 getOpenTags() + public void literal(String xml) throws IOException { - return (Stack)_tags.clone(); + _out.append(xml); } + }