summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorAidan Skinner <aidan@apache.org>2009-01-09 12:03:03 +0000
committerAidan Skinner <aidan@apache.org>2009-01-09 12:03:03 +0000
commite0ad51233c158f7ca8d84b90b45b23937da6fd1f (patch)
tree14cfb693ad10979b08a0e15f6d4cb239d4ae3083 /java
parent11e35dd461a19e23053756cee5c4ec214fa5597f (diff)
downloadqpid-python-e0ad51233c158f7ca8d84b90b45b23937da6fd1f.tar.gz
QPID-1563: Use createTempFile
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@733016 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java')
-rw-r--r--java/broker/src/main/java/org/apache/qpid/server/security/access/management/AMQUserManagementMBean.java16
-rw-r--r--java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java6
2 files changed, 3 insertions, 19 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/access/management/AMQUserManagementMBean.java b/java/broker/src/main/java/org/apache/qpid/server/security/access/management/AMQUserManagementMBean.java
index 32ec3a3bbc..7ff3bd3541 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/access/management/AMQUserManagementMBean.java
+++ b/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/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java b/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java
index cca9deb6da..bf459542de 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java
+++ b/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
{