Author: alesj Date: 2009-12-07 08:04:16 -0500 (Mon, 07 Dec 2009) New Revision: 97503 Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/AbstractBundleState.java projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/GenericServiceReferenceWrapper.java projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/OSGiServiceState.java Log: Remove unnecessary count check -- we removed add/remove used by usage. Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/AbstractBundleState.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/AbstractBundleState.java 2009-12-07 12:58:57 UTC (rev 97502) +++ projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/AbstractBundleState.java 2009-12-07 13:04:16 UTC (rev 97503) @@ -366,12 +366,9 @@ List<ServiceReference> references = new ArrayList<ServiceReference>(); for (ControllerContext context : contexts) { - if (getUsedByCount(context, this) > 0) - { - ServiceReference ref = getBundleManager().getServiceReferenceForContext(context); - if (ref != null) - references.add(ref); - } + ServiceReference ref = getBundleManager().getServiceReferenceForContext(context); + if (ref != null) + references.add(ref); } if (references.isEmpty()) Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/GenericServiceReferenceWrapper.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/GenericServiceReferenceWrapper.java 2009-12-07 12:58:57 UTC (rev 97502) +++ projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/GenericServiceReferenceWrapper.java 2009-12-07 13:04:16 UTC (rev 97503) @@ -92,11 +92,8 @@ Set<Bundle> bundles = new HashSet<Bundle>(); for (Object user : users) { - if (ct.getUsedByCount(context, user) > 0) - { - AbstractBundleState abs = manager.getBundleForUser(user); - bundles.add(abs.getBundleInternal()); - } + AbstractBundleState abs = manager.getBundleForUser(user); + bundles.add(abs.getBundleInternal()); } if (bundles.isEmpty() == false) return bundles.toArray(new Bundle[bundles.size()]); Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/OSGiServiceState.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/OSGiServiceState.java 2009-12-07 12:58:57 UTC (rev 97502) +++ projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/OSGiServiceState.java 2009-12-07 13:04:16 UTC (rev 97503) @@ -542,11 +542,8 @@ Set<Bundle> bundles = new HashSet<Bundle>(); for (Object user : users) { - if (ct.getUsedByCount(this, user) > 0) - { - AbstractBundleState abs = manager.getBundleForUser(user); - bundles.add(abs.getBundleInternal()); - } + AbstractBundleState abs = manager.getBundleForUser(user); + bundles.add(abs.getBundleInternal()); } return bundles.toArray(new Bundle[bundles.size()]); }