You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2015/07/27 14:43:40 UTC
[1/4] git commit: updated refs/heads/master to 22f194b
Repository: cloudstack
Updated Branches:
refs/heads/master 66f516342 -> 22f194b88
coverity 1147049: buffered file reader resource guard
Signed-off-by: Daan Hoogland <da...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/488ee88a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/488ee88a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/488ee88a
Branch: refs/heads/master
Commit: 488ee88ae8453ad5029758020847aa09f9cd8ebc
Parents: 66f5163
Author: Daan Hoogland <da...@onecht.net>
Authored: Fri Jul 17 15:36:56 2015 +0200
Committer: Daan Hoogland <da...@gmail.com>
Committed: Mon Jul 27 14:43:10 2015 +0200
----------------------------------------------------------------------
core/src/com/cloud/storage/template/VmdkProcessor.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/488ee88a/core/src/com/cloud/storage/template/VmdkProcessor.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/template/VmdkProcessor.java b/core/src/com/cloud/storage/template/VmdkProcessor.java
index 6903b74..929157e 100644
--- a/core/src/com/cloud/storage/template/VmdkProcessor.java
+++ b/core/src/com/cloud/storage/template/VmdkProcessor.java
@@ -86,9 +86,10 @@ public class VmdkProcessor extends AdapterBase implements Processor {
long virtualSize = 0;
String templateFileFullPath = templatePath.endsWith(File.separator) ? templatePath : templatePath + File.separator;
templateFileFullPath += templateName.endsWith(ImageFormat.VMDK.getFileExtension()) ? templateName : templateName + "." + ImageFormat.VMDK.getFileExtension();
- try {
- FileReader fileReader = new FileReader(templateFileFullPath);
- BufferedReader bufferedReader = new BufferedReader(fileReader);
+ try (
+ FileReader fileReader = new FileReader(templateFileFullPath);
+ BufferedReader bufferedReader = new BufferedReader(fileReader);
+ ) {
Pattern regex = Pattern.compile("(RW|RDONLY|NOACCESS) (\\d+) (FLAT|SPARSE|ZERO|VMFS|VMFSSPARSE|VMFSDRM|VMFSRAW)");
String line = null;
while((line = bufferedReader.readLine()) != null) {
@@ -99,7 +100,6 @@ public class VmdkProcessor extends AdapterBase implements Processor {
break;
}
}
- bufferedReader.close();
} catch(FileNotFoundException ex) {
String msg = "Unable to open file '" + templateFileFullPath + "' " + ex.toString();
s_logger.error(msg);
[2/4] git commit: updated refs/heads/master to 22f194b
Posted by da...@apache.org.
coverity 1133705: output writer close
Signed-off-by: Daan Hoogland <da...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8b350c37
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8b350c37
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8b350c37
Branch: refs/heads/master
Commit: 8b350c37bd7b35234829c4709565eb339d99c2d5
Parents: 488ee88
Author: Daan Hoogland <da...@onecht.net>
Authored: Fri Jul 17 15:47:39 2015 +0200
Committer: Daan Hoogland <da...@gmail.com>
Committed: Mon Jul 27 14:43:11 2015 +0200
----------------------------------------------------------------------
server/src/com/cloud/server/ConfigurationServerImpl.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8b350c37/server/src/com/cloud/server/ConfigurationServerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/server/ConfigurationServerImpl.java b/server/src/com/cloud/server/ConfigurationServerImpl.java
index 288eeeb..e7a928a 100644
--- a/server/src/com/cloud/server/ConfigurationServerImpl.java
+++ b/server/src/com/cloud/server/ConfigurationServerImpl.java
@@ -650,11 +650,11 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio
} else { // !keystoreFile.exists() and dbExisted
// Export keystore to local file
byte[] storeBytes = Base64.decodeBase64(dbString);
- try {
- String tmpKeystorePath = "/tmp/tmpkey";
- FileOutputStream fo = new FileOutputStream(tmpKeystorePath);
+ String tmpKeystorePath = "/tmp/tmpkey";
+ try (
+ FileOutputStream fo = new FileOutputStream(tmpKeystorePath);
+ ) {
fo.write(storeBytes);
- fo.close();
Script script = new Script(true, "cp", 5000, null);
script.add("-f");
script.add(tmpKeystorePath);
[3/4] git commit: updated refs/heads/master to 22f194b
Posted by da...@apache.org.
coverity 1125362, 1125363: assorted resource leaks
Signed-off-by: Daan Hoogland <da...@gmail.com>
This closes #602
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/22f194b8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/22f194b8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/22f194b8
Branch: refs/heads/master
Commit: 22f194b8888ab1464399b8328e58e7291619c13f
Parents: 3a4d371
Author: Daan Hoogland <da...@onecht.net>
Authored: Fri Jul 17 16:24:13 2015 +0200
Committer: Daan Hoogland <da...@gmail.com>
Committed: Mon Jul 27 14:43:11 2015 +0200
----------------------------------------------------------------------
.../utils/crypt/EncryptionSecretKeyChecker.java | 42 ++++++++------------
1 file changed, 16 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/22f194b8/utils/src/com/cloud/utils/crypt/EncryptionSecretKeyChecker.java
----------------------------------------------------------------------
diff --git a/utils/src/com/cloud/utils/crypt/EncryptionSecretKeyChecker.java b/utils/src/com/cloud/utils/crypt/EncryptionSecretKeyChecker.java
index b28b067..6524987 100644
--- a/utils/src/com/cloud/utils/crypt/EncryptionSecretKeyChecker.java
+++ b/utils/src/com/cloud/utils/crypt/EncryptionSecretKeyChecker.java
@@ -30,7 +30,6 @@ import java.util.Properties;
import javax.annotation.PostConstruct;
-import org.apache.commons.io.IOUtils;
import org.apache.log4j.Logger;
import org.jasypt.encryption.pbe.StandardPBEStringEncryptor;
import org.jasypt.encryption.pbe.config.SimpleStringPBEConfig;
@@ -83,15 +82,12 @@ public class EncryptionSecretKeyChecker {
if(is == null) { //This is means we are not able to load key file from the classpath.
throw new CloudRuntimeException(s_keyFile + " File containing secret key not found in the classpath: ");
}
- BufferedReader in = null;
- try {
- in = new BufferedReader(new InputStreamReader(is));
+
+ try (BufferedReader in = new BufferedReader(new InputStreamReader(is));) {
secretKey = in.readLine();
//Check for null or empty secret key
} catch (IOException e) {
throw new CloudRuntimeException("Error while reading secret key from: " + s_keyFile, e);
- } finally {
- IOUtils.closeQuietly(in);
}
if (secretKey == null || secretKey.isEmpty()) {
@@ -104,30 +100,24 @@ public class EncryptionSecretKeyChecker {
throw new CloudRuntimeException("Environment variable " + s_envKey + " is not set or empty");
}
} else if (encryptionType.equals("web")) {
- ServerSocket serverSocket = null;
int port = 8097;
- try {
- serverSocket = new ServerSocket(port);
+ try (ServerSocket serverSocket = new ServerSocket(port);) {
+ s_logger.info("Waiting for admin to send secret key on port " + port);
+ try (
+ Socket clientSocket = serverSocket.accept();
+ PrintWriter out = new PrintWriter(clientSocket.getOutputStream(), true);
+ BufferedReader in = new BufferedReader(new InputStreamReader(clientSocket.getInputStream()));
+ ) {
+ String inputLine;
+ if ((inputLine = in.readLine()) != null) {
+ secretKey = inputLine;
+ }
+ } catch (IOException e) {
+ throw new CloudRuntimeException("Accept failed on " + port);
+ }
} catch (IOException ioex) {
throw new CloudRuntimeException("Error initializing secret key reciever", ioex);
}
- s_logger.info("Waiting for admin to send secret key on port " + port);
- Socket clientSocket = null;
- try {
- clientSocket = serverSocket.accept();
- } catch (IOException e) {
- throw new CloudRuntimeException("Accept failed on " + port);
- }
- PrintWriter out = new PrintWriter(clientSocket.getOutputStream(), true);
- BufferedReader in = new BufferedReader(new InputStreamReader(clientSocket.getInputStream()));
- String inputLine;
- if ((inputLine = in.readLine()) != null) {
- secretKey = inputLine;
- }
- out.close();
- in.close();
- clientSocket.close();
- serverSocket.close();
} else {
throw new CloudRuntimeException("Invalid encryption type: " + encryptionType);
}
[4/4] git commit: updated refs/heads/master to 22f194b
Posted by da...@apache.org.
coverity 1147051: trivial db resource leak in endpoint selector should have been nested try catches before try-with-resource beacame available
Signed-off-by: Daan Hoogland <da...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3a4d3716
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3a4d3716
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3a4d3716
Branch: refs/heads/master
Commit: 3a4d3716650bd689d92bf170519d2c336e436e28
Parents: 8b350c3
Author: Daan Hoogland <da...@onecht.net>
Authored: Fri Jul 17 15:56:04 2015 +0200
Committer: Daan Hoogland <da...@gmail.com>
Committed: Mon Jul 27 14:43:11 2015 +0200
----------------------------------------------------------------------
.../endpoint/DefaultEndPointSelector.java | 19 ++++---------------
1 file changed, 4 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3a4d3716/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
----------------------------------------------------------------------
diff --git a/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java b/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
index 0778e54..d38aaed 100644
--- a/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
+++ b/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
@@ -395,30 +395,19 @@ public class DefaultEndPointSelector implements EndPointSelector {
sbuilder.append(" ORDER by rand() limit 1");
String sql = sbuilder.toString();
- PreparedStatement pstmt = null;
- ResultSet rs = null;
HostVO host = null;
TransactionLegacy txn = TransactionLegacy.currentTxn();
- try {
- pstmt = txn.prepareStatement(sql);
- rs = pstmt.executeQuery();
+ try (
+ PreparedStatement pstmt = txn.prepareStatement(sql);
+ ResultSet rs = pstmt.executeQuery();
+ ) {
while (rs.next()) {
long id = rs.getLong(1);
host = hostDao.findById(id);
}
} catch (SQLException e) {
s_logger.warn("can't find endpoint", e);
- } finally {
- try {
- if (rs != null) {
- rs.close();
- }
- if (pstmt != null) {
- pstmt.close();
- }
- } catch (SQLException e) {
- }
}
if (host == null) {