modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/group/inventory/AddGroupResourcesFormPrepareAction.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
New commits: commit 7f4d76951a1e2686aa4d104477765d9b4d350dad Author: Lukas Krejci lkrejci@redhat.com Date: Wed Feb 24 18:13:05 2010 +0100
BZ 566749 - fixing the NPE when adding platforms (that don't have a parent) to a resource group.
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/group/inventory/AddGroupResourcesFormPrepareAction.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/group/inventory/AddGroupResourcesFormPrepareAction.java index 698cb5a..808f331 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/group/inventory/AddGroupResourcesFormPrepareAction.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/group/inventory/AddGroupResourcesFormPrepareAction.java @@ -201,7 +201,10 @@ public class AddGroupResourcesFormPrepareAction extends Action { Resource resource = dr.getOriginal();
Resource parent = resource.getParentResource(); - parent.setName(buildLineage(dr.getParents())); + //platforms don't have parents, need to check for null here + if (parent != null) { + parent.setName(buildLineage(dr.getParents())); + }
convertedResults.add(resource); }
rhq-commits@lists.fedorahosted.org