From 144265dbf419c3461aca479cb09d223489ca057d Mon Sep 17 00:00:00 2001
From: Edison Su <Edison.Su@citrix.com>
Date: Thu, 5 Jan 2012 18:18:27 -0800
Subject: [PATCH] bug 12791: Simulator: reload vm state when restart mgt
 server. status 12791: resolved fixed

---
 .../src/com/cloud/resource/AgentRoutingResource.java      | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/agent-simulator/src/com/cloud/resource/AgentRoutingResource.java b/agent-simulator/src/com/cloud/resource/AgentRoutingResource.java
index 2a35b55ca96..df30b47737b 100644
--- a/agent-simulator/src/com/cloud/resource/AgentRoutingResource.java
+++ b/agent-simulator/src/com/cloud/resource/AgentRoutingResource.java
@@ -46,7 +46,7 @@ import com.cloud.vm.VirtualMachine.State;
 public class AgentRoutingResource extends AgentStorageResource {
     private static final Logger s_logger = Logger.getLogger(AgentRoutingResource.class);
 
-    protected Map<String, State> _vms = new HashMap<String, State>(20);
+    protected Map<String, State> _vms = new HashMap<String, State>();
     protected String _mountParent;
 
 
@@ -91,6 +91,12 @@ public class AgentRoutingResource extends AgentStorageResource {
         if (isStopped()) {
             return null;
         }
+        synchronized (_vms) {
+        	if (_vms.size() == 0) {
+        		//load vms state from database
+        		_vms.putAll(_simMgr.getVmStates(hostGuid));
+        	}
+        }
         final HashMap<String, State> newStates = sync();
         HashMap<String, Pair<Long, Long>> nwGrpStates = _simMgr.syncNetworkGroups(hostGuid);
         return new PingRoutingWithNwGroupsCommand(getType(), id, newStates, nwGrpStates);