From db5afa4994cbe4795238d40df075977bd7ad6f4f Mon Sep 17 00:00:00 2001
From: Alex Huang <alex@cloud.com>
Date: Sat, 9 Jul 2011 08:31:44 -0700
Subject: [PATCH] fix migration npe when recovering

---
 server/src/com/cloud/ha/HighAvailabilityManagerImpl.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java b/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
index 27a8edc8474..cf0bd0bcba5 100644
--- a/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
+++ b/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
@@ -261,9 +261,11 @@ public class HighAvailabilityManagerImpl implements HighAvailabilityManager, Clu
 
     @Override
     public boolean scheduleMigration(final VMInstanceVO vm) {
-        final HaWorkVO work = new HaWorkVO(vm.getId(), vm.getType(), WorkType.Migration, Step.Scheduled, vm.getHostId(), vm.getState(), 0, vm.getUpdated());
-        _haDao.persist(work);
-        wakeupWorkers();
+        if (vm.getHostId() != null) {
+            final HaWorkVO work = new HaWorkVO(vm.getId(), vm.getType(), WorkType.Migration, Step.Scheduled, vm.getHostId(), vm.getState(), 0, vm.getUpdated());
+            _haDao.persist(work);
+            wakeupWorkers();
+        }
         return true;
     }