svn commit: r1402218 - /karaf/cellar/branches/cellar-2.2.x/management/src/main/java/org/apache/karaf/cellar/management/internal/CellarBundleMBeanImpl.java

[jbonofre]

Author: jbonofre
Date: Thu Oct 25 17:02:52 2012
New Revision: 1402218

URL: http://svn.apache.org/viewvc?rev=1402218&view=rev
Log:
[KARAF-1975] Fix CellarBundleMBean getBundles() operation

Modified:
    
karaf/cellar/branches/cellar-2.2.x/management/src/main/java/org/apache/karaf/cellar/management/internal/CellarBundleMBeanImpl.java

Modified: 
karaf/cellar/branches/cellar-2.2.x/management/src/main/java/org/apache/karaf/cellar/management/internal/CellarBundleMBeanImpl.java
URL: 
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/management/src/main/java/org/apache/karaf/cellar/management/internal/CellarBundleMBeanImpl.java?rev=1402218&r1=1402217&r2=1402218&view=diff
==============================================================================
--- 
karaf/cellar/branches/cellar-2.2.x/management/src/main/java/org/apache/karaf/cellar/management/internal/CellarBundleMBeanImpl.java
 (original)
+++ 
karaf/cellar/branches/cellar-2.2.x/management/src/main/java/org/apache/karaf/cellar/management/internal/CellarBundleMBeanImpl.java
 Thu Oct 25 17:02:52 2012
@@ -22,6 +22,7 @@ import org.apache.karaf.cellar.core.even
 import org.apache.karaf.cellar.core.event.EventTransportFactory;
 import org.apache.karaf.cellar.core.event.EventType;
 import org.apache.karaf.cellar.management.CellarBundleMBean;
+import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleEvent;
 import org.osgi.service.cm.ConfigurationAdmin;
 
@@ -276,9 +277,36 @@ public class CellarBundleMBeanImpl exten
                 String name = tokens[0];
                 String version = tokens[1];
                 BundleState state = bundles.get(bundle);
+                String status;
+                switch (state.getStatus()) {
+                    case BundleEvent.INSTALLED:
+                        status = "Installed";
+                        break;
+                    case BundleEvent.RESOLVED:
+                        status = "Resolved";
+                        break;
+                    case BundleEvent.STARTED:
+                        status = "Active";
+                        break;
+                    case BundleEvent.STARTING:
+                        status = "Starting";
+                        break;
+                    case BundleEvent.STOPPED:
+                        status = "Resolved";
+                        break;
+                    case BundleEvent.STOPPING:
+                        status = "Stopping";
+                        break;
+                    case BundleEvent.UNINSTALLED:
+                        status = "Uninstalled";
+                        break;
+                    default:
+                        status = "";
+                        break;
+                }
                 CompositeData data = new CompositeDataSupport(compositeType,
                         new String[]{"name", "version", "status", "location"},
-                        new Object[]{name, version, state.getStatus(), 
state.getLocation()});
+                        new Object[]{name, version, status, 
state.getLocation()});
                 table.put(data);
             }
         } finally {