Return-Path: 
 <commits-return-30942-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 131C010527
	for <apmail-cloudstack-commits-archive@www.apache.org>;
 Mon,  9 Sep 2013 23:03:53 +0000 (UTC)
Received: (qmail 42734 invoked by uid 500); 9 Sep 2013 23:03:51 -0000
Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org
Received: (qmail 42705 invoked by uid 500); 9 Sep 2013 23:03:51 -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 42661 invoked by uid 99); 9 Sep 2013 23:03:51 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Sep 2013 23:03:51 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 03437825607; Mon,  9 Sep 2013 23:03:50 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: edison@apache.org
To: commits@cloudstack.apache.org
Message-Id: <e75329d35920445996e6cc9501190309@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: git commit: updated refs/heads/4.2-forward to cb170d6
Date: Mon,  9 Sep 2013 23:03:50 +0000 (UTC)

Updated Branches:
  refs/heads/4.2-forward 37c87a84f -> cb170d6af


CLOUDSTACK-4627: fix NPE in vm migration


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

Branch: refs/heads/4.2-forward
Commit: cb170d6afdab20bd63f17728b8f04a05f14ebcec
Parents: 37c87a8
Author: Edison Su <sudison@gmail.com>
Authored: Mon Sep 9 15:58:22 2013 -0700
Committer: Edison Su <sudison@gmail.com>
Committed: Mon Sep 9 15:58:22 2013 -0700

----------------------------------------------------------------------
 server/src/com/cloud/storage/VolumeManagerImpl.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cb170d6a/server/src/com/cloud/storage/VolumeManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/VolumeManagerImpl.java b/server/src/com/cloud/storage/VolumeManagerImpl.java
index 4569202..232b640 100644
--- a/server/src/com/cloud/storage/VolumeManagerImpl.java
+++ b/server/src/com/cloud/storage/VolumeManagerImpl.java
@@ -2657,7 +2657,8 @@ public class VolumeManagerImpl extends ManagerBase implements VolumeManager {
     public boolean canVmRestartOnAnotherServer(long vmId) {
         List<VolumeVO> vols = _volsDao.findCreatedByInstance(vmId);
         for (VolumeVO vol : vols) {
-            if (!vol.isRecreatable() && !vol.getPoolType().isShared()) {
+            StoragePoolVO storagePoolVO = _storagePoolDao.findById(vol.getPoolId());
+            if (!vol.isRecreatable() && storagePoolVO != null && storagePoolVO.getPoolType() != null && !(storagePoolVO.getPoolType().isShared())) {
                 return false;
             }
         }