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

Conflicts:
	jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
	jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java

1 files changed, 5 insertions, 2 deletions

diff --git a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/test/XmlConfiguredJetty.java b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/test/XmlConfiguredJetty.java
index a14facc8e7..6f9790ec71 100644
--- a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/test/XmlConfiguredJetty.java
+++ b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/test/XmlConfiguredJetty.java
@@ -24,6 +24,7 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStream;
 import java.net.InetAddress;
 import java.net.MalformedURLException;
 import java.net.URI;
@@ -123,8 +124,10 @@ public class XmlConfiguredJetty
 
         // Write out configuration for use by ConfigurationManager.
         File testConfig = new File(_jettyHome, "xml-configured-jetty.properties");
-        FileOutputStream out = new FileOutputStream(testConfig);
-        properties.store(out,"Generated by " + XmlConfiguredJetty.class.getName());
+        try (OutputStream out = new FileOutputStream(testConfig))
+        {
+            properties.store(out,"Generated by " + XmlConfiguredJetty.class.getName());
+        }
         for (Object key:properties.keySet())
             setProperty(String.valueOf(key),String.valueOf(properties.get(key)));
     }