You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ma...@apache.org on 2021/01/26 14:35:55 UTC
[zookeeper] branch master updated: ZOOKEEPER-4037: Closing
autoCloseable resource with try-with-resources block
This is an automated email from the ASF dual-hosted git repository.
maoling pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
The following commit(s) were added to refs/heads/master by this push:
new a30acd2 ZOOKEEPER-4037: Closing autoCloseable resource with try-with-resources block
a30acd2 is described below
commit a30acd2b9168042d52f593c985cbbda8622d83d7
Author: lan <17...@qq.com>
AuthorDate: Tue Jan 26 22:35:44 2021 +0800
ZOOKEEPER-4037: Closing autoCloseable resource with try-with-resources block
Author: lan <17...@qq.com>
Reviewers: maoling <ma...@sina.com>, Matteo Minardi <ma...@diennea.com>
Closes #1565 from lanicc/ZOOKEEPER-4037
---
.../zookeeper/server/quorum/QuorumPeerConfig.java | 28 ++++------------------
1 file changed, 5 insertions(+), 23 deletions(-)
diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/QuorumPeerConfig.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/QuorumPeerConfig.java
index 7a73180..c56204f 100644
--- a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/QuorumPeerConfig.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/QuorumPeerConfig.java
@@ -180,12 +180,9 @@ public class QuorumPeerConfig {
.build()).create(path);
Properties cfg = new Properties();
- FileInputStream in = new FileInputStream(configFile);
- try {
+ try (FileInputStream in = new FileInputStream(configFile)) {
cfg.load(in);
configFileStr = path;
- } finally {
- in.close();
}
/* Read entire config file as initial configuration */
@@ -201,8 +198,7 @@ public class QuorumPeerConfig {
if (dynamicConfigFileStr != null) {
try {
Properties dynamicCfg = new Properties();
- FileInputStream inConfig = new FileInputStream(dynamicConfigFileStr);
- try {
+ try (FileInputStream inConfig = new FileInputStream(dynamicConfigFileStr)) {
dynamicCfg.load(inConfig);
if (dynamicCfg.getProperty("version") != null) {
throw new ConfigException("dynamic file shouldn't have version inside");
@@ -214,8 +210,6 @@ public class QuorumPeerConfig {
if (version != null) {
dynamicCfg.setProperty("version", version);
}
- } finally {
- inConfig.close();
}
setupQuorumPeerConfig(dynamicCfg, false);
@@ -228,11 +222,8 @@ public class QuorumPeerConfig {
if (nextDynamicConfigFile.exists()) {
try {
Properties dynamicConfigNextCfg = new Properties();
- FileInputStream inConfigNext = new FileInputStream(nextDynamicConfigFile);
- try {
+ try (FileInputStream inConfigNext = new FileInputStream(nextDynamicConfigFile)) {
dynamicConfigNextCfg.load(inConfigNext);
- } finally {
- inConfigNext.close();
}
boolean isHierarchical = false;
for (Entry<Object, Object> entry : dynamicConfigNextCfg.entrySet()) {
@@ -529,18 +520,12 @@ public class QuorumPeerConfig {
new AtomicFileWritingIdiom(new File(configFileStr + ".bak"), new OutputStreamStatement() {
@Override
public void write(OutputStream output) throws IOException {
- InputStream input = null;
- try {
- input = new FileInputStream(new File(configFileStr));
+ try (InputStream input = new FileInputStream(new File(configFileStr))) {
byte[] buf = new byte[1024];
int bytesRead;
while ((bytesRead = input.read(buf)) > 0) {
output.write(buf, 0, bytesRead);
}
- } finally {
- if (input != null) {
- input.close();
- }
}
}
});
@@ -597,11 +582,8 @@ public class QuorumPeerConfig {
.build()).create(dynamicFileStr);
final Properties cfg = new Properties();
- FileInputStream in = new FileInputStream(configFile);
- try {
+ try (FileInputStream in = new FileInputStream(configFile)) {
cfg.load(in);
- } finally {
- in.close();
}
new AtomicFileWritingIdiom(new File(configFileStr), new WriterStatement() {