Return-Path: 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 868CCDF9A for ; Wed, 15 May 2013 17:19:14 +0000 (UTC) Received: (qmail 30409 invoked by uid 500); 15 May 2013 17:19:08 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 30355 invoked by uid 500); 15 May 2013 17:19:08 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 30169 invoked by uid 99); 15 May 2013 17:19:07 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 May 2013 17:19:07 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id CAC23B01A; Wed, 15 May 2013 17:19:07 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bfederle@apache.org To: commits@cloudstack.apache.org Date: Wed, 15 May 2013 17:19:18 -0000 Message-Id: <7b5df22aa1d04296afbbd75a30012cdc@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [13/20] git commit: updated refs/heads/ui-vpc-redesign to 59a9984 CLOUDSTACK-2515: Verify if the targetPath isn't null before comparing Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/68a428f8 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/68a428f8 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/68a428f8 Branch: refs/heads/ui-vpc-redesign Commit: 68a428f84dea9c051456882d6762f419c40d90db Parents: 9b65134 Author: Wido den Hollander Authored: Wed May 15 13:57:58 2013 +0200 Committer: Wido den Hollander Committed: Wed May 15 13:57:58 2013 +0200 ---------------------------------------------------------------------- .../kvm/storage/LibvirtStorageAdaptor.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/68a428f8/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java index 8f58719..e7e4bbf 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java @@ -465,7 +465,8 @@ public class LibvirtStorageAdaptor implements StorageAdaptor { StoragePool p = conn.storagePoolLookupByName(poolname); LibvirtStoragePoolDef pdef = getStoragePoolDef(conn, p); - if (pdef.getTargetPath().equals(path)) { + String targetPath = pdef.getTargetPath(); + if (targetPath != null && targetPath.equals(path)) { s_logger.debug("Storage pool utilizing path '" + path + "' already exists as pool " + poolname + ", undefining so we can re-define with correct name " + name); if (p.isPersistent() == 1) {