[jboss-osgi-commits] JBoss-OSGI SVN: r97499 - projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle.

[jboss-osgi-commits at lists.jboss.org]

Author: alesj
Date: 2009-12-07 06:52:56 -0500 (Mon, 07 Dec 2009)
New Revision: 97499

Modified:
   projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/GenericServiceReferenceWrapper.java
Log:
Fix getUsginBundles return value.

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 11:52:20 UTC (rev 97498)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/GenericServiceReferenceWrapper.java	2009-12-07 11:52:56 UTC (rev 97499)
@@ -87,18 +87,19 @@
          if (ct == null)
             return null;
 
+         OSGiBundleManager manager = bundleState.getBundleManager();
          Set<Object> users = ct.getUsers(context);
          Set<Bundle> bundles = new HashSet<Bundle>();
          for (Object user : users)
          {
             if (ct.getUsedByCount(context, user) > 0)
             {
-               OSGiBundleManager manager = bundleState.getBundleManager();
                AbstractBundleState abs = manager.getBundleForUser(user);
                bundles.add(abs.getBundleInternal());
             }
          }
-         return bundles.toArray(new Bundle[bundles.size()]);
+         if (bundles.isEmpty() == false)
+            return bundles.toArray(new Bundle[bundles.size()]);
       }
       return null;
    }