1 files changed, 10 insertions, 1 deletions
diff --git a/java/client/src/main/java/org/apache/qpid/jndi/PropertiesFileInitialContextFactory.java b/java/client/src/main/java/org/apache/qpid/jndi/PropertiesFileInitialContextFactory.java
index f0f9a9840c..fec5af55c1 100644
--- a/java/client/src/main/java/org/apache/qpid/jndi/PropertiesFileInitialContextFactory.java
+++ b/java/client/src/main/java/org/apache/qpid/jndi/PropertiesFileInitialContextFactory.java
@@ -81,10 +81,19 @@ public class PropertiesFileInitialContextFactory implements InitialContextFactor
             if (file != null)
             {
                 _logger.info("Loading Properties from:" + file);
+
                 // Load the properties specified
+                BufferedInputStream inputStream = new BufferedInputStream(new FileInputStream(file));
                 Properties p = new Properties();
+                try
+                {
+                    p.load(inputStream);
+                }
+                finally
+                {
+                    inputStream.close();
+                }
 
-                p.load(new BufferedInputStream(new FileInputStream(file)));
                 Strings.Resolver resolver = new Strings.ChainedResolver
                     (Strings.SYSTEM_RESOLVER, new Strings.PropertiesResolver(p));