Return-Path: 
 <commits-return-36550-apmail-cloudstack-commits-archive=cloudstack.apache.org@cloudstack.apache.org>
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 E08E91007E
	for <apmail-cloudstack-commits-archive@www.apache.org>;
 Wed,  8 Jan 2014 13:41:34 +0000 (UTC)
Received: (qmail 45507 invoked by uid 500); 8 Jan 2014 13:41:33 -0000
Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org
Received: (qmail 45359 invoked by uid 500); 8 Jan 2014 13:41:28 -0000
Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cloudstack.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cloudstack.apache.org>
List-Post: <mailto:commits@cloudstack.apache.org>
List-Id: <commits.cloudstack.apache.org>
Reply-To: dev@cloudstack.apache.org
Delivered-To: mailing list commits@cloudstack.apache.org
Received: (qmail 45331 invoked by uid 99); 8 Jan 2014 13:41:21 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Jan 2014 13:41:21 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 1EF62546AD; Wed,  8 Jan 2014 13:41:21 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: kishan@apache.org
To: commits@cloudstack.apache.org
Date: Wed, 08 Jan 2014 13:41:22 -0000
Message-Id: <391a821ca7d0408682692d3ff592c30d@git.apache.org>
In-Reply-To: <4ba5e336de5a41eb9e647995a5d0ed43@git.apache.org>
References: <4ba5e336de5a41eb9e647995a5d0ed43@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [2/3] git commit: updated refs/heads/master to 3e45dfb

CLOUDSTACK-5742 Add usage event detials for vm state transitions when using custom compute offering.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3e45dfb9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3e45dfb9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3e45dfb9

Branch: refs/heads/master
Commit: 3e45dfb9421e5e21ba56ed3b55d685c3f742246f
Parents: 776b505
Author: Kishan Kavala <kishan@cloud.com>
Authored: Wed Jan 8 19:10:02 2014 +0530
Committer: Kishan Kavala <kishan@cloud.com>
Committed: Wed Jan 8 19:10:40 2014 +0530

----------------------------------------------------------------------
 server/src/com/cloud/vm/UserVmStateListener.java | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3e45dfb9/server/src/com/cloud/vm/UserVmStateListener.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/vm/UserVmStateListener.java b/server/src/com/cloud/vm/UserVmStateListener.java
index 68b98f5..2f6be6c 100644
--- a/server/src/com/cloud/vm/UserVmStateListener.java
+++ b/server/src/com/cloud/vm/UserVmStateListener.java
@@ -24,6 +24,7 @@ import java.util.Map;
 
 import javax.inject.Inject;
 
+import com.cloud.server.ManagementService;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 
@@ -36,7 +37,6 @@ import com.cloud.event.UsageEventVO;
 import com.cloud.event.dao.UsageEventDao;
 import com.cloud.network.dao.NetworkDao;
 import com.cloud.network.dao.NetworkVO;
-import com.cloud.server.ManagementServer;
 import com.cloud.service.ServiceOfferingVO;
 import com.cloud.service.dao.ServiceOfferingDao;
 import com.cloud.utils.component.ComponentContext;
@@ -44,10 +44,6 @@ import com.cloud.utils.fsm.StateListener;
 import com.cloud.vm.VirtualMachine.Event;
 import com.cloud.vm.VirtualMachine.State;
 import com.cloud.vm.dao.NicDao;
-import com.cloud.vm.dao.UserVmDetailsDao;
-import org.apache.cloudstack.framework.events.EventBus;
-import org.apache.log4j.Logger;
-import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 
 public class UserVmStateListener implements StateListener<State, VirtualMachine.Event, VirtualMachine> {
 
@@ -57,8 +53,8 @@ public class UserVmStateListener implements StateListener<State, VirtualMachine.
     @Inject protected ServiceOfferingDao _offeringDao;
     private static final Logger s_logger = Logger.getLogger(UserVmStateListener.class);
 
-    protected static EventBus _eventBus = null;
-    
+    protected static EventBus s_eventBus = null;
+
     public UserVmStateListener(UsageEventDao usageEventDao, NetworkDao networkDao, NicDao nicDao, ServiceOfferingDao offeringDao) {
         this._usageEventDao = usageEventDao;
         this._networkDao = networkDao;
@@ -98,7 +94,7 @@ public class UserVmStateListener implements StateListener<State, VirtualMachine.
             }
         } else if (VirtualMachine.State.isVmDestroyed(oldState, event, newState)) {
             generateUsageEvent(vo.getServiceOfferingId(), vo, EventTypes.EVENT_VM_DESTROY);
-        } 
+        }
         return true;
     }