From 4069e9f9b054db800eba549d52f315a5841c0157 Mon Sep 17 00:00:00 2001
From: Robert Godfrey <rgodfrey@apache.org>
Date: Thu, 2 Feb 2012 09:17:51 +0000
Subject: QPID-3789 : Fix AbstractPasswordFilePrincipalDatabase to remove
 possibility of leaked open stream

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1239496 13f79535-47bb-0310-9956-ffa450edef68
---
 .../AbstractPasswordFilePrincipalDatabase.java        | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'java/broker/src/main')

diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/AbstractPasswordFilePrincipalDatabase.java b/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/AbstractPasswordFilePrincipalDatabase.java
index 9277b80b99..7088fae50c 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/AbstractPasswordFilePrincipalDatabase.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/AbstractPasswordFilePrincipalDatabase.java
@@ -358,19 +358,26 @@ public abstract class AbstractPasswordFilePrincipalDatabase<U extends PasswordPr
             catch(IOException e)
             {
                 getLogger().error("Unable to create the new password file: " + e);
-                throw new IOException("Unable to create the new password file" + e);
+                throw new IOException("Unable to create the new password file",e);
             }
             finally
             {
-                if (reader != null)
+
+                try
                 {
-                    reader.close();
+                    if (reader != null)
+                    {
+                        reader.close();
+                    }
                 }
-
-                if (writer != null)
+                finally
                 {
-                    writer.close();
+                    if (writer != null)
+                    {
+                        writer.close();
+                    }
                 }
+
             }
 
             swapTempFileToLive(tmp);
-- 
cgit v1.2.1