QPID-1563: Use createTempFile

merge from trunk 733016


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

2 files changed, 3 insertions, 19 deletions

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/management/AMQUserManagementMBean.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/management/AMQUserManagementMBean.java
index 32ec3a3bbc..7ff3bd3541 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/management/AMQUserManagementMBean.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/management/AMQUserManagementMBean.java
@@ -396,23 +396,11 @@ public class AMQUserManagementMBean extends AMQManagedObject implements UserMana
             _accessRightsUpdate.lock();
             try
             {
-                // remove old temporary file
-                File tmp = new File(_accessFileName + ".tmp");
-                if (tmp.exists())
-                {
-                    tmp.delete();
-                }
-
-                //remove old backup
-                File old = new File(_accessFileName + ".old");
-                if (old.exists())
-                {
-                    old.delete();
-                }
+                // Create temporary file
+                File tmp = File.createTempFile(_accessFileName, ".tmp");
 
                 // Rename current file
                 File rights = new File(_accessFileName);
-                rights.renameTo(old);
 
                 FileOutputStream output = new FileOutputStream(tmp);
                 _accessRights.store(output, "Generated by AMQUserManagementMBean Console : Last edited by user:" + getCurrentJMXUser());
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java
index cca9deb6da..bf459542de 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java
@@ -386,11 +386,7 @@ public class Base64MD5PasswordFilePrincipalDatabase implements PrincipalDatabase
 
             BufferedReader reader = null;
             PrintStream writer = null;
-            File tmp = new File(_passwordFile.getAbsolutePath() + ".tmp");
-            if (tmp.exists())
-            {
-                tmp.delete();
-            }
+            File tmp = File.createTempFile(_passwordFile.getName(), ".tmp");
 
             try
             {