Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2013-09-09 05:41:17 +0000
committerGreg Wilkins2013-09-09 05:41:17 +0000
commit070ce9dd22eb84f42c213a6f97ca95df2ac332ed (patch)
tree20e04f7ba5c4f142bca3c333604fda2bd52497f2 /jetty-deploy/src/test
parent7df5cf762c50580901518ec6490eda5169fbd0e1 (diff)
parent767faece5c4692748d1ac8e130b2e4c5faa1ff20 (diff)
downloadorg.eclipse.jetty.project-070ce9dd22eb84f42c213a6f97ca95df2ac332ed.tar.gz
org.eclipse.jetty.project-070ce9dd22eb84f42c213a6f97ca95df2ac332ed.tar.xz
org.eclipse.jetty.project-070ce9dd22eb84f42c213a6f97ca95df2ac332ed.zip
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
Diffstat (limited to 'jetty-deploy/src/test')
-rw-r--r--jetty-deploy/src/test/java/org/eclipse/jetty/deploy/test/XmlConfiguredJetty.java7
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)));
}

Back to the top