Return-Path: 
 <commits-return-24307-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 AA6FC10B48
	for <apmail-cloudstack-commits-archive@www.apache.org>;
 Tue, 18 Jun 2013 07:58:21 +0000 (UTC)
Received: (qmail 31300 invoked by uid 500); 18 Jun 2013 07:58:07 -0000
Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org
Received: (qmail 31247 invoked by uid 500); 18 Jun 2013 07:58:07 -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 29219 invoked by uid 99); 18 Jun 2013 07:58:02 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Jun 2013 07:58:02 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 19E3D8A6C68; Tue, 18 Jun 2013 07:58:02 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: weizhou@apache.org
To: commits@cloudstack.apache.org
Date: Tue, 18 Jun 2013 07:58:32 -0000
Message-Id: <0f8237460ee84837a7c32861f1fc877a@git.apache.org>
In-Reply-To: <794bf5ee734945ac90230397b26673f4@git.apache.org>
References: <794bf5ee734945ac90230397b26673f4@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [32/50] [abbrv] git commit: updated refs/heads/disk_io_throttling to
 691bc9d

NPE fix

- fixes an NPE in case the pool.scope = null
- replaces null checks around toString with ObjectUtils.toString call

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>


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

Branch: refs/heads/disk_io_throttling
Commit: 202cd1529054fe60acce0cce54686268797b65bd
Parents: c88d8fb
Author: Laszlo Hornyak <laszlo.hornyak@gmail.com>
Authored: Sun Jun 16 10:42:17 2013 +0200
Committer: Chip Childers <chip.childers@gmail.com>
Committed: Mon Jun 17 19:19:43 2013 +0100

----------------------------------------------------------------------
 .../com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/202cd152/server/src/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java
index 6d0cde1..f2b9525 100644
--- a/server/src/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java
+++ b/server/src/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java
@@ -25,6 +25,7 @@ import javax.inject.Inject;
 import com.cloud.capacity.Capacity;
 import org.apache.cloudstack.api.response.StoragePoolResponse;
 import org.apache.cloudstack.engine.subsystem.api.storage.ScopeType;
+import org.apache.commons.lang.ObjectUtils;
 import org.apache.log4j.Logger;
 import org.springframework.stereotype.Component;
 
@@ -79,17 +80,12 @@ public class StoragePoolJoinDaoImpl extends GenericDaoBase<StoragePoolJoinVO, Lo
         poolResponse.setZoneId(pool.getZoneUuid());
         poolResponse.setZoneName(pool.getZoneName());
         poolResponse.setZoneType(pool.getZoneType());
-        if (pool.getPoolType() != null) {
-            poolResponse.setType(pool.getPoolType().toString());
-        }
+        poolResponse.setType(ObjectUtils.toString(pool.getPoolType(), null));
         poolResponse.setPodId(pool.getPodUuid());
         poolResponse.setPodName(pool.getPodName());
         poolResponse.setCreated(pool.getCreated());
-        poolResponse.setScope(pool.getScope().toString());
-        if (pool.getHypervisor() != null) {
-            poolResponse.setHypervisor(pool.getHypervisor().toString());
-        }
-
+        poolResponse.setScope(ObjectUtils.toString(pool.getScope(), null));
+        poolResponse.setHypervisor(ObjectUtils.toString(pool.getHypervisor(), null));
 
         long allocatedSize = pool.getUsedCapacity() +  pool.getReservedCapacity();
         poolResponse.setDiskSizeTotal(pool.getCapacityBytes());