You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ai...@apache.org on 2009/01/12 17:08:57 UTC
svn commit: r733830 - in
/qpid/branches/M4-RCs/qpid/java/broker/src/main/java/org/apache/qpid/server/security:
access/management/AMQUserManagementMBean.java
auth/database/Base64MD5PasswordFilePrincipalDatabase.java
Author: aidan
Date: Mon Jan 12 08:08:46 2009
New Revision: 733830
URL: http://svn.apache.org/viewvc?rev=733830&view=rev
Log:
QPID-1563: Use createTempFile
merge from trunk 733016
Modified:
qpid/branches/M4-RCs/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/management/AMQUserManagementMBean.java
qpid/branches/M4-RCs/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java
Modified: qpid/branches/M4-RCs/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/management/AMQUserManagementMBean.java
URL: http://svn.apache.org/viewvc/qpid/branches/M4-RCs/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/management/AMQUserManagementMBean.java?rev=733830&r1=733829&r2=733830&view=diff
==============================================================================
--- qpid/branches/M4-RCs/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/management/AMQUserManagementMBean.java (original)
+++ qpid/branches/M4-RCs/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/management/AMQUserManagementMBean.java Mon Jan 12 08:08:46 2009
@@ -396,23 +396,11 @@
_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());
Modified: qpid/branches/M4-RCs/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java
URL: http://svn.apache.org/viewvc/qpid/branches/M4-RCs/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java?rev=733830&r1=733829&r2=733830&view=diff
==============================================================================
--- qpid/branches/M4-RCs/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java (original)
+++ qpid/branches/M4-RCs/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java Mon Jan 12 08:08:46 2009
@@ -386,11 +386,7 @@
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
{