Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BE7F91119C for ; Tue, 5 Aug 2014 11:46:39 +0000 (UTC) Received: (qmail 98543 invoked by uid 500); 5 Aug 2014 11:46:39 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 98516 invoked by uid 500); 5 Aug 2014 11:46:39 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 98507 invoked by uid 99); 5 Aug 2014 11:46:39 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Aug 2014 11:46:39 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 3C52C9BF64A; Tue, 5 Aug 2014 11:46:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: santhoshedukulla@apache.org To: commits@cloudstack.apache.org Message-Id: <053fc765597d4120baab937354a34a87@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to 64b9ca0 Date: Tue, 5 Aug 2014 11:46:39 +0000 (UTC) Repository: cloudstack Updated Branches: refs/heads/master 221c118b4 -> 64b9ca0a3 Fixed a coverity reported concurrency issue Signed-off-by: Santhosh Edukulla Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/64b9ca0a Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/64b9ca0a Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/64b9ca0a Branch: refs/heads/master Commit: 64b9ca0a35f18437741f83f8b06665af1331f290 Parents: 221c118 Author: Santhosh Edukulla Authored: Tue Aug 5 17:14:05 2014 +0530 Committer: Santhosh Edukulla Committed: Tue Aug 5 17:16:09 2014 +0530 ---------------------------------------------------------------------- .../server/src/com/cloud/consoleproxy/ConsoleProxy.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/64b9ca0a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxy.java ---------------------------------------------------------------------- diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxy.java b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxy.java index 3b3b82f..863f0bf 100644 --- a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxy.java +++ b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxy.java @@ -504,7 +504,9 @@ public class ConsoleProxy { } public static ConsoleProxyClientStatsCollector getStatsCollector() { - return new ConsoleProxyClientStatsCollector(connectionMap); + synchronized (connectionMap) { + return new ConsoleProxyClientStatsCollector(connectionMap); + } } public static void authenticationExternally(ConsoleProxyClientParam param) throws AuthenticationException {