Merging from trunk r1617322:1617736 in the Java tree

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.30@1620337 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 14 insertions, 13 deletions

diff --git a/qpid/java/tools/src/main/java/org/apache/qpid/tools/JNDICheck.java b/qpid/java/tools/src/main/java/org/apache/qpid/tools/JNDICheck.java
index c604b24408..bd6cfd4363 100644
--- a/qpid/java/tools/src/main/java/org/apache/qpid/tools/JNDICheck.java
+++ b/qpid/java/tools/src/main/java/org/apache/qpid/tools/JNDICheck.java
@@ -21,21 +21,22 @@
 
 package org.apache.qpid.tools;
 
-import org.apache.qpid.client.AMQDestination;
-import org.apache.qpid.client.AMQConnectionFactory;
-import org.apache.qpid.jms.FailoverPolicy;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Properties;
 
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
-import java.util.Properties;
-import java.util.Hashtable;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.LinkedList;
-import java.io.IOException;
-import java.io.File;
-import java.io.FileInputStream;
+
+import org.apache.qpid.client.AMQConnectionFactory;
+import org.apache.qpid.client.AMQDestination;
+import org.apache.qpid.jms.FailoverPolicy;
 
 public class JNDICheck
 {
@@ -79,9 +80,9 @@ public class JNDICheck
         // Load JNDI properties
         Properties properties = new Properties();
 
-        try
+        try(FileInputStream propertiesStream = new FileInputStream(new File(propertyFile)))
         {
-            properties.load(new FileInputStream(new File(propertyFile)));
+            properties.load(propertiesStream);
         }
         catch (IOException e)
         {