Merge remote-tracking branch 'origin/master' into jetty-http2

Conflicts:
	jetty-util/src/main/java/org/eclipse/jetty/util/IteratingCallback.java

2 files changed, 7 insertions, 8 deletions

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 79711a66a0..64270af347 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
@@ -22,7 +22,6 @@ import java.io.Closeable;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
 import java.util.Map;
 import java.util.Stack;
 
@@ -61,7 +60,7 @@ public class XmlAppendable
         _out.append("<?xml version=\"1.0\" encoding=\""+encoding+"\"?>\n");
     }
 
-    public XmlAppendable open(String tag, Map<String,String> attributes) throws IOException
+    public XmlAppendable openTag(String tag, Map<String,String> attributes) throws IOException
     {
         _out.append(_space).append('<').append(tag);
         attributes(attributes);
@@ -72,7 +71,7 @@ public class XmlAppendable
         return this;
     }
     
-    public XmlAppendable open(String tag) throws IOException
+    public XmlAppendable openTag(String tag) throws IOException
     {
         _out.append(_space).append('<').append(tag).append(">\n");
         _space=_space+SPACES.substring(0,_indent);
@@ -159,7 +158,7 @@ public class XmlAppendable
         return this;
     }
     
-    public XmlAppendable close() throws IOException
+    public XmlAppendable closeTag() throws IOException
     {
         if (_tags.isEmpty())
             throw new IllegalStateException("Tags closed");
diff --git a/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlAppendableTest.java b/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlAppendableTest.java
index 6a1556e4dd..0e491f6b74 100644
--- a/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlAppendableTest.java
+++ b/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlAppendableTest.java
@@ -33,7 +33,7 @@ public class XmlAppendableTest
         XmlAppendable out = new XmlAppendable(b);
         Map<String, String> attr = new LinkedHashMap<>();
 
-        out.open("test");
+        out.openTag("test");
 
         attr.put("name", "attr value");
         attr.put("noval", null);
@@ -43,10 +43,10 @@ public class XmlAppendableTest
         out.tag("tag", attr);
         out.tag("tag", attr, "content");
 
-        out.open("level1").tag("tag", "content").tag("tag", "content").close();
-        out.open("level1", attr).open("level2").tag("tag", "content").tag("tag", "content").close().close();
+        out.openTag("level1").tag("tag", "content").tag("tag", "content").closeTag();
+        out.openTag("level1", attr).openTag("level2").tag("tag", "content").tag("tag", "content").closeTag().closeTag();
 
-        out.close();
+        out.closeTag();
 
         String expected = "" +
                 "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +