Mailing-List: contact dev-help@cloudstack.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cloudstack.apache.org
From: DaanHoogland <git@git.apache.org>
To: dev@cloudstack.apache.org
Reply-To: dev@cloudstack.apache.org
References: <git-pr-918-cloudstack@git.apache.org>
In-Reply-To: <git-pr-918-cloudstack@git.apache.org>
Subject: [GitHub] cloudstack pull request: CLOUDSTACK-8941: fix NPE when
 migrate vm ...
Content-Type: text/plain
Message-Id: <20151025105951.B87A2DFF41@git1-us-west.apache.org>
Date: Sun, 25 Oct 2015 10:59:51 +0000 (UTC)

Github user DaanHoogland commented on a diff in the pull request:

    https://github.com/apache/cloudstack/pull/918#discussion_r42943657
  
    --- Diff: engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java ---
    @@ -1763,7 +1763,7 @@ private void orchestrateStorageMigration(final String vmUuid, final StoragePool
                 if (migrationResult) {
                     //if the vm is migrated to different pod in basic mode, need to reallocate ip
     
    -                if (!vm.getPodIdToDeployIn().equals(destPool.getPodId())) {
    +                if (destPool.getPodId() != null && !destPool.getPodId().equals(vm.getPodIdToDeployIn())) {
    --- End diff --
    
    destpool is not guaranteed to be not null either. Overlooked that detail before but maybe we want to change the condition to
    (destPool != null && destPool.getPodId() != null && !destPool.getPodId().equals(vm.getPodIdToDeployIn()))


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---