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 7027A17789 for ; Thu, 5 Feb 2015 11:51:39 +0000 (UTC) Received: (qmail 36221 invoked by uid 500); 5 Feb 2015 11:51:38 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 36105 invoked by uid 500); 5 Feb 2015 11:51:38 -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 35500 invoked by uid 99); 5 Feb 2015 11:51:38 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Feb 2015 11:51:38 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CB31EE0663; Thu, 5 Feb 2015 11:51:37 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bhaisaab@apache.org To: commits@cloudstack.apache.org Date: Thu, 05 Feb 2015 11:51:45 -0000 Message-Id: In-Reply-To: <0a2d1e7c249a4413a97df3f10d902f25@git.apache.org> References: <0a2d1e7c249a4413a97df3f10d902f25@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [09/22] git commit: updated refs/heads/4.5 to 78b9be0 CID-1116546 Fix resource leak (cherry picked from commit fe0168f6d2d1ee144a1a6e0580464420f1dfa5fe) Signed-off-by: Rohit Yadav Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6fc97f91 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6fc97f91 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6fc97f91 Branch: refs/heads/4.5 Commit: 6fc97f9181732bd475a12f6df7f5cc3c8b5994b0 Parents: 7de7885 Author: Hugo Trippaers Authored: Tue Nov 18 14:30:55 2014 +0100 Committer: Rohit Yadav Committed: Thu Feb 5 15:32:08 2015 +0530 ---------------------------------------------------------------------- usage/src/com/cloud/usage/UsageServer.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6fc97f91/usage/src/com/cloud/usage/UsageServer.java ---------------------------------------------------------------------- diff --git a/usage/src/com/cloud/usage/UsageServer.java b/usage/src/com/cloud/usage/UsageServer.java index 37d4b70..d4f19eb 100644 --- a/usage/src/com/cloud/usage/UsageServer.java +++ b/usage/src/com/cloud/usage/UsageServer.java @@ -25,7 +25,6 @@ import org.apache.commons.daemon.DaemonInitException; import org.apache.log4j.Logger; import org.apache.log4j.PropertyConfigurator; import org.apache.log4j.xml.DOMConfigurator; -import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.util.Log4jConfigurer; @@ -36,7 +35,8 @@ public class UsageServer implements Daemon { private static final Logger s_logger = Logger.getLogger(UsageServer.class.getName()); public static final String Name = "usage-server"; - UsageManager mgr; + private UsageManager mgr; + private ClassPathXmlApplicationContext appContext; /** * @param args @@ -54,7 +54,8 @@ public class UsageServer implements Daemon { @Override public void start() { - ApplicationContext appContext = new ClassPathXmlApplicationContext("usageApplicationContext.xml"); + + appContext = new ClassPathXmlApplicationContext("usageApplicationContext.xml"); try { ComponentContext.initComponentsLifeCycle(); @@ -73,7 +74,7 @@ public class UsageServer implements Daemon { @Override public void stop() { - + appContext.close(); } @Override