You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2015/02/22 20:11:13 UTC
svn commit: r1661530 - in
/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server:
model/adapter/ security/auth/database/ security/group/ util/
Author: kwall
Date: Sun Feb 22 19:11:13 2015
New Revision: 1661530
URL: http://svn.apache.org/r1661530
Log:
QPID-6247: [Java Broker] Use try-with-resources to avoid some repeated cleanup code
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderImpl.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/AbstractPasswordFilePrincipalDatabase.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/group/FileGroupDatabase.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/FileHelper.java
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderImpl.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderImpl.java?rev=1661530&r1=1661529&r2=1661530&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderImpl.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderImpl.java Sun Feb 22 19:11:13 2015
@@ -39,7 +39,6 @@ import java.util.TreeMap;
import org.apache.log4j.Logger;
import org.apache.qpid.server.configuration.BrokerProperties;
-import org.apache.qpid.server.store.StoreException;
import org.apache.qpid.server.util.BaseAction;
import org.apache.qpid.server.util.FileHelper;
import org.codehaus.jackson.JsonParser;
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/AbstractPasswordFilePrincipalDatabase.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/AbstractPasswordFilePrincipalDatabase.java?rev=1661530&r1=1661529&r2=1661530&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/AbstractPasswordFilePrincipalDatabase.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/AbstractPasswordFilePrincipalDatabase.java Sun Feb 22 19:11:13 2015
@@ -249,13 +249,9 @@ public abstract class AbstractPasswordFi
private void writeToFile(File tmp) throws IOException
{
- BufferedReader reader = null;
- PrintStream writer = null;
-
- try
+ try(PrintStream writer = new PrintStream(tmp);
+ BufferedReader reader = new BufferedReader(new FileReader(_passwordFile)))
{
- writer = new PrintStream(tmp);
- reader = new BufferedReader(new FileReader(_passwordFile));
String line;
while ((line = reader.readLine()) != null)
@@ -313,25 +309,6 @@ public abstract class AbstractPasswordFi
getLogger().error("Unable to create the new password file: " + e);
throw new IOException("Unable to create the new password file",e);
}
- finally
- {
-
- try
- {
- if (reader != null)
- {
- reader.close();
- }
- }
- finally
- {
- if (writer != null)
- {
- writer.close();
- }
- }
-
- }
}
protected abstract U createUserFromPassword(Principal principal, char[] passwd);
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/group/FileGroupDatabase.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/group/FileGroupDatabase.java?rev=1661530&r1=1661529&r2=1661530&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/group/FileGroupDatabase.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/group/FileGroupDatabase.java Sun Feb 22 19:11:13 2015
@@ -34,7 +34,6 @@ import java.util.concurrent.ConcurrentSk
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
-import org.apache.qpid.server.util.Action;
import org.apache.qpid.server.util.BaseAction;
import org.apache.qpid.server.util.FileHelper;
import org.apache.qpid.server.util.ServerScopedRuntimeException;
@@ -254,18 +253,10 @@ public class FileGroupDatabase implement
public void performAction(File file) throws IOException
{
String comment = "Written " + new Date();
- FileOutputStream fileOutputStream = new FileOutputStream(file);
- try
+ try(FileOutputStream fileOutputStream = new FileOutputStream(file))
{
propertiesFile.store(fileOutputStream, comment);
}
- finally
- {
- if(fileOutputStream != null)
- {
- fileOutputStream.close();
- }
- }
}
});
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/FileHelper.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/FileHelper.java?rev=1661530&r1=1661529&r2=1661530&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/FileHelper.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/FileHelper.java Sun Feb 22 19:11:13 2015
@@ -125,7 +125,8 @@ public class FileHelper
}
else
{
- throw new RuntimeException("Atomic move is unsupported and rename failed");
+ throw new RuntimeException("Atomic move is unsupported and rename from : '"
+ + sourceFile + "' to: '" + targetFile + "' failed.");
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org