svn commit: r1484773 - in /karaf/trunk/package/core/src/main/java/org/apache/karaf/packages/core: PackageVersion.java internal/Packages.java

[anierbeck]

Author: anierbeck
Date: Tue May 21 12:18:06 2013
New Revision: 1484773

URL: http://svn.apache.org/r1484773
Log:
[KARAF-2323] - Package MBean fails for export

Modified:
    
karaf/trunk/package/core/src/main/java/org/apache/karaf/packages/core/PackageVersion.java
    
karaf/trunk/package/core/src/main/java/org/apache/karaf/packages/core/internal/Packages.java

Modified: 
karaf/trunk/package/core/src/main/java/org/apache/karaf/packages/core/PackageVersion.java
URL: 
http://svn.apache.org/viewvc/karaf/trunk/package/core/src/main/java/org/apache/karaf/packages/core/PackageVersion.java?rev=1484773&r1=1484772&r2=1484773&view=diff
==============================================================================
--- 
karaf/trunk/package/core/src/main/java/org/apache/karaf/packages/core/PackageVersion.java
 (original)
+++ 
karaf/trunk/package/core/src/main/java/org/apache/karaf/packages/core/PackageVersion.java
 Tue May 21 12:18:06 2013
@@ -16,8 +16,8 @@
  */
 package org.apache.karaf.packages.core;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.HashSet;
+import java.util.Set;
 
 import org.osgi.framework.Bundle;
 import org.osgi.framework.Version;
@@ -26,7 +26,7 @@ public class PackageVersion {
 
     private String packageName;
     private Version version;
-    private List<Bundle> bundles = new ArrayList<Bundle>();
+    private Set<Bundle> bundles = new HashSet<Bundle>();
     
     public PackageVersion(String packageName, Version version) {
         this.packageName = packageName;
@@ -45,7 +45,7 @@ public class PackageVersion {
         this.bundles.add(bundle);
     }
     
-    public List<Bundle> getBundles() {
+    public Set<Bundle> getBundles() {
         return this.bundles;
     }
 

Modified: 
karaf/trunk/package/core/src/main/java/org/apache/karaf/packages/core/internal/Packages.java
URL: 
http://svn.apache.org/viewvc/karaf/trunk/package/core/src/main/java/org/apache/karaf/packages/core/internal/Packages.java?rev=1484773&r1=1484772&r2=1484773&view=diff
==============================================================================
--- 
karaf/trunk/package/core/src/main/java/org/apache/karaf/packages/core/internal/Packages.java
 (original)
+++ 
karaf/trunk/package/core/src/main/java/org/apache/karaf/packages/core/internal/Packages.java
 Tue May 21 12:18:06 2013
@@ -75,6 +75,7 @@ public class Packages extends StandardMB
                                          bundle.getBundleId(),
                                          bundle.getSymbolicName()};
                     CompositeData comp = new CompositeDataSupport(bundleType, 
names, data);
+                    log.debug("Adding CompositeDataSupport {} for key: {}", 
comp, key);
                     table.put(comp);
                 }
             }