modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DeletedResourceTypeFilter.java | 21 ---------- 1 file changed, 21 deletions(-)
New commits: commit 7956a4e7494a130ddf21fd948a1d95df201d01a8 Author: Thomas Segismont tsegismo@redhat.com Date: Wed Mar 13 14:58:43 2013 +0100
Removed duplicate method in DeletedResourceTypeFilter
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DeletedResourceTypeFilter.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DeletedResourceTypeFilter.java index 347bc03..8db311a 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DeletedResourceTypeFilter.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DeletedResourceTypeFilter.java @@ -65,27 +65,6 @@ public class DeletedResourceTypeFilter { } }
- public boolean accept(InventoryReport report) { - Set<ResourceType> resourceTypes = getResourceTypes(report.getAddedRoots()); - - for (ResourceType type : resourceTypes) { - // We check two things to determine whether a report should be rejected. First we check - // that the plugin from which the type comes is installed. We check that the plugin is - // installed as opposed to checking that it is deleted because the plugin could also - // be purged in which case checking against deleted plugins wouldn't catch it. Secondly, - // we check to see if the type is a deleted type. Here we check against deleted types - // instead of installed types because the number of deleted types at any given time - // should be much smaller than the number of installed types, resulting in faster look - // ups. If we have a stale type in the report and that type has already been purged from - // the database, it will get flagged by the check against installed plugins. - if (!installedPlugins.contains(type.getPlugin()) || - deletedTypes.contains(type.getName() + "::" + type.getPlugin())) { - return false; - } - } - return true; - } - public Set<ResourceType> apply(InventoryReport report) { Set<ResourceType> resourceTypes = getResourceTypes(report.getAddedRoots()); Set<ResourceType> staleTypes = new HashSet<ResourceType>();
rhq-commits@lists.fedorahosted.org