Return-Path: X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B2DDFFC7E for ; Thu, 21 Mar 2013 05:22:09 +0000 (UTC) Received: (qmail 83542 invoked by uid 500); 21 Mar 2013 05:21:58 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 82859 invoked by uid 500); 21 Mar 2013 05:21:54 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 79956 invoked by uid 99); 21 Mar 2013 05:21: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; Thu, 21 Mar 2013 05:21:51 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 166D93EC2D; Thu, 21 Mar 2013 05:21:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: koushik@apache.org To: cloudstack-commits@incubator.apache.org Date: Thu, 21 Mar 2013 05:22:21 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [34/50] [abbrv] git commit: refs/heads/cisco-vnmc-api-integration - CLOUDSTACK-1641: fix NPE during migrate volume CLOUDSTACK-1641: fix NPE during migrate volume Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/1ea5d6c1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/1ea5d6c1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/1ea5d6c1 Branch: refs/heads/cisco-vnmc-api-integration Commit: 1ea5d6c169eb470cf8c356f5ea358b2a3ee170da Parents: ba249c0 Author: Edison Su Authored: Tue Mar 19 15:34:18 2013 -0700 Committer: Edison Su Committed: Tue Mar 19 15:34:31 2013 -0700 ---------------------------------------------------------------------- .../src/com/cloud/storage/VolumeManagerImpl.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1ea5d6c1/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 a23ea32..737ed0a 100644 --- a/server/src/com/cloud/storage/VolumeManagerImpl.java +++ b/server/src/com/cloud/storage/VolumeManagerImpl.java @@ -2133,7 +2133,7 @@ public class VolumeManagerImpl extends ManagerBase implements VolumeManager { + assignedPool + " assigned by deploymentPlanner"); } - VolumeTask task = new VolumeTask(VolumeTaskType.MIGRATE, vol, null); + VolumeTask task = new VolumeTask(VolumeTaskType.MIGRATE, vol, assignedPool); tasks.add(task); } } else {