Repository: cloudstack Updated Branches: refs/heads/master 0a7af329f -> 6bccf5ff4
Fixed coverity reported concurrency issues Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6bccf5ff Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6bccf5ff Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6bccf5ff Branch: refs/heads/master Commit: 6bccf5ff41ee2177ca081ea8eb9f9bf9bbe256ce Parents: 0a7af32 Author: Santhosh Edukulla <santhosh.eduku...@gmail.com> Authored: Wed Aug 6 17:28:49 2014 +0530 Committer: Santhosh Edukulla <santhosh.eduku...@gmail.com> Committed: Wed Aug 6 17:28:49 2014 +0530 ---------------------------------------------------------------------- agent/src/com/cloud/agent/dao/impl/PropertiesStorage.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6bccf5ff/agent/src/com/cloud/agent/dao/impl/PropertiesStorage.java ---------------------------------------------------------------------- diff --git a/agent/src/com/cloud/agent/dao/impl/PropertiesStorage.java b/agent/src/com/cloud/agent/dao/impl/PropertiesStorage.java index c573f29..08c8049 100755 --- a/agent/src/com/cloud/agent/dao/impl/PropertiesStorage.java +++ b/agent/src/com/cloud/agent/dao/impl/PropertiesStorage.java @@ -66,7 +66,7 @@ public class PropertiesStorage implements StorageComponent { } @Override - public boolean configure(String name, Map<String, Object> params) { + public synchronized boolean configure(String name, Map<String, Object> params) { _name = name; String path = (String)params.get("path"); if (path == null) { @@ -86,7 +86,6 @@ public class PropertiesStorage implements StorageComponent { return false; } } - try { PropertiesUtil.loadFromFile(_properties, file); _file = file; @@ -97,7 +96,6 @@ public class PropertiesStorage implements StorageComponent { s_logger.error("IOException: ", e); return false; } - return true; }