Repository: cloudstack Updated Branches: refs/heads/master b9799481a -> 6cfe248e2
Fixed NPE in listResourceDetalis logic Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6cfe248e Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6cfe248e Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6cfe248e Branch: refs/heads/master Commit: 6cfe248e2b08777ccb539f449dd402ce0788e5d2 Parents: b979948 Author: Alena Prokharchyk <[email protected]> Authored: Fri Apr 18 16:18:18 2014 -0700 Committer: Alena Prokharchyk <[email protected]> Committed: Fri Apr 18 16:32:05 2014 -0700 ---------------------------------------------------------------------- server/src/com/cloud/api/query/QueryManagerImpl.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6cfe248e/server/src/com/cloud/api/query/QueryManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/query/QueryManagerImpl.java b/server/src/com/cloud/api/query/QueryManagerImpl.java index 9b0fe1c..157d7fb 100644 --- a/server/src/com/cloud/api/query/QueryManagerImpl.java +++ b/server/src/com/cloud/api/query/QueryManagerImpl.java @@ -26,9 +26,6 @@ import java.util.Set; import javax.ejb.Local; import javax.inject.Inject; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; - import org.apache.cloudstack.acl.ControlledEntity.ACLType; import org.apache.cloudstack.affinity.AffinityGroupDomainMapVO; import org.apache.cloudstack.affinity.AffinityGroupResponse; @@ -98,6 +95,8 @@ import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager; import org.apache.cloudstack.engine.subsystem.api.storage.TemplateState; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.apache.cloudstack.query.QueryService; +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.api.query.dao.AccountJoinDao; import com.cloud.api.query.dao.AffinityGroupJoinDao; @@ -3361,7 +3360,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { detailList = _resourceMetaDataMgr.getDetailsList(resourceId, resourceType, forDisplay); } else { requestedDetail = _resourceMetaDataMgr.getDetail(resourceId, resourceType, key); - if (forDisplay != null && requestedDetail.isDisplay() != forDisplay) { + if (requestedDetail != null && forDisplay != null && requestedDetail.isDisplay() != forDisplay) { requestedDetail = null; } }
