modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
New commits: commit 1979ff15f1b4c7a87c0bf651ebf109cb473d0502 Author: Ian Springer ian.springer@redhat.com Date: Tue Feb 14 13:39:43 2012 -0500
[BZ 789419] fix NPE that was preventing manual-add/import of top-level servers (https://bugzilla.redhat.com/show_bug.cgi?id=789419)
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java index 2a33d98..9ce6a3a 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java @@ -299,8 +299,7 @@ public class ResourceTypeRepository {
criteria.setPageControl(PageControl.getUnlimitedInstance());
- Log.info("Loading " + typesNeeded.size() - + ((metadataTypes != null) ? (" types: " + metadataTypes) : "")); + Log.info("Loading " + typesNeeded.size() + " types fetching metadata " + metadataTypesNeeded + "...");
if ((topLevelServerAndServiceTypes == null) && metadataTypesNeeded.contains(MetadataType.children)) { // Perform a one-time load of server and service types with no parent types. These types are implicitly @@ -310,7 +309,7 @@ public class ResourceTypeRepository { // server/service types will be added to the platform types' childResourceTypes fields. loadTopLevelServerAndServiceTypes(callback, metadataTypesNeeded, criteria, cachedTypes); } else { - loadRequestedTypes(callback, metadataTypes, criteria, cachedTypes); + loadRequestedTypes(callback, metadataTypesNeeded, criteria, cachedTypes); } }
rhq-commits@lists.fedorahosted.org