From 6c683e733a4f2afbe76f8b37e71620f64634c2d7 Mon Sep 17 00:00:00 2001
From: kishan <kishan@cloud.com>
Date: Mon, 27 Sep 2010 18:29:02 +0530
Subject: [PATCH] bug 5851,6312: fixed start event ids for router start/stop
 events status 5851,6312: resolved fixed

---
 server/src/com/cloud/network/NetworkManagerImpl.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index 5dd5ec4ec74..ec603e50dc9 100644
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -2018,7 +2018,10 @@ public class NetworkManagerImpl implements NetworkManager, VirtualMachineManager
         event.setState(EventState.Started);
         event.setDescription("Stopping Router with Id: "+routerId);
         event.setStartId(eventId);
-        _eventDao.persist(event);
+        event = _eventDao.persist(event);
+        if(eventId == 0){
+            eventId = event.getId();
+        }
         
         try {
             
@@ -2230,7 +2233,7 @@ public class NetworkManagerImpl implements NetworkManager, VirtualMachineManager
 	@Override
 	public DomainRouterVO addVirtualMachineToGuestNetwork(UserVmVO vm, String password, long startEventId) throws ConcurrentOperationException {
         try {
-        	DomainRouterVO router = start(vm.getDomainRouterId(), startEventId);
+        	DomainRouterVO router = start(vm.getDomainRouterId(), 0);
 	        if (router == null) {
         		s_logger.error("Can't find a domain router to start VM: " + vm.getName());
         		return null;