You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2012/03/08 10:22:50 UTC

svn commit: r1298314 - in /karaf/trunk: features/management/src/main/java/org/apache/karaf/features/management/internal/ management/mbeans/bundles/src/main/java/org/apache/karaf/management/mbeans/bundles/internal/ management/mbeans/http/src/main/java/o...

Author: jbonofre
Date: Thu Mar  8 09:22:49 2012
New Revision: 1298314

URL: http://svn.apache.org/viewvc?rev=1298314&view=rev
Log:
[KARAF-1175] Catch exception populating TabularData in MBean to avoid empty tables

Modified:
    karaf/trunk/features/management/src/main/java/org/apache/karaf/features/management/internal/FeaturesServiceMBeanImpl.java
    karaf/trunk/management/mbeans/bundles/src/main/java/org/apache/karaf/management/mbeans/bundles/internal/BundlesMBeanImpl.java
    karaf/trunk/management/mbeans/http/src/main/java/org/apache/karaf/management/mbeans/http/internal/HttpMBeanImpl.java
    karaf/trunk/management/mbeans/obr/src/main/java/org/apache/karaf/management/mbeans/obr/internal/ObrMBeanImpl.java
    karaf/trunk/management/mbeans/services/src/main/java/org/apache/karaf/management/mbeans/services/internal/ServicesMBeanImpl.java
    karaf/trunk/web/management/src/main/java/org/apache/karaf/web/management/internal/WebMBeanImpl.java

Modified: karaf/trunk/features/management/src/main/java/org/apache/karaf/features/management/internal/FeaturesServiceMBeanImpl.java
URL: http://svn.apache.org/viewvc/karaf/trunk/features/management/src/main/java/org/apache/karaf/features/management/internal/FeaturesServiceMBeanImpl.java?rev=1298314&r1=1298313&r2=1298314&view=diff
==============================================================================
--- karaf/trunk/features/management/src/main/java/org/apache/karaf/features/management/internal/FeaturesServiceMBeanImpl.java (original)
+++ karaf/trunk/features/management/src/main/java/org/apache/karaf/features/management/internal/FeaturesServiceMBeanImpl.java Thu Mar  8 09:22:49 2012
@@ -91,7 +91,11 @@ public class FeaturesServiceMBeanImpl ex
             List<Feature> insFeatures = Arrays.asList(featuresService.listInstalledFeatures());
             ArrayList<JmxFeature> features = new ArrayList<JmxFeature>();
             for (Feature feature : allFeatures) {
-                features.add(new JmxFeature(feature, insFeatures.contains(feature)));
+                try {
+                    features.add(new JmxFeature(feature, insFeatures.contains(feature)));
+                } catch (Throwable t) {
+                    t.printStackTrace();
+                }
             }
             TabularData table = JmxFeature.tableFrom(features);
             return table;
@@ -109,7 +113,11 @@ public class FeaturesServiceMBeanImpl ex
             List<Repository> allRepositories = Arrays.asList(featuresService.listRepositories());
             ArrayList<JmxRepository> repositories = new ArrayList<JmxRepository>();
             for (Repository repository : allRepositories) {
-                repositories.add(new JmxRepository(repository));
+                try { 
+                    repositories.add(new JmxRepository(repository));
+                } catch (Throwable t) {
+                    t.printStackTrace();
+                }
             }
             TabularData table = JmxRepository.tableFrom(repositories);
             return table;

Modified: karaf/trunk/management/mbeans/bundles/src/main/java/org/apache/karaf/management/mbeans/bundles/internal/BundlesMBeanImpl.java
URL: http://svn.apache.org/viewvc/karaf/trunk/management/mbeans/bundles/src/main/java/org/apache/karaf/management/mbeans/bundles/internal/BundlesMBeanImpl.java?rev=1298314&r1=1298313&r2=1298314&view=diff
==============================================================================
--- karaf/trunk/management/mbeans/bundles/src/main/java/org/apache/karaf/management/mbeans/bundles/internal/BundlesMBeanImpl.java (original)
+++ karaf/trunk/management/mbeans/bundles/src/main/java/org/apache/karaf/management/mbeans/bundles/internal/BundlesMBeanImpl.java Thu Mar  8 09:22:49 2012
@@ -49,33 +49,37 @@ public class BundlesMBeanImpl extends St
 
     public TabularData getBundles() throws Exception {
         CompositeType bundleType = new CompositeType("Bundle", "OSGi Bundle",
-                new String[]{ "ID", "Name", "Version", "Start Level", "State" },
-                new String[]{ "ID of the Bundle", "Name of the Bundle", "Version of the Bundle", "Start Level of the Bundle", "Current State of the Bundle" },
-                new OpenType[]{ SimpleType.LONG, SimpleType.STRING, SimpleType.STRING, SimpleType.INTEGER, SimpleType.STRING });
-        TabularType tableType = new TabularType("Bundles", "Tables of all Bundles", bundleType, new String[]{ "ID" });
+                new String[]{"ID", "Name", "Version", "Start Level", "State"},
+                new String[]{"ID of the Bundle", "Name of the Bundle", "Version of the Bundle", "Start Level of the Bundle", "Current State of the Bundle"},
+                new OpenType[]{SimpleType.LONG, SimpleType.STRING, SimpleType.STRING, SimpleType.INTEGER, SimpleType.STRING});
+        TabularType tableType = new TabularType("Bundles", "Tables of all Bundles", bundleType, new String[]{"ID"});
         TabularData table = new TabularDataSupport(tableType);
 
         Bundle[] bundles = bundleContext.getBundles();
 
         for (int i = 0; i < bundles.length; i++) {
-            int bundleStartLevel = getBundleStartLevel(bundles[i]).getStartLevel();
-            int bundleState = bundles[i].getState();
-            String bundleStateString;
-            if (bundleState == Bundle.ACTIVE)
-                bundleStateString = "ACTIVE";
-            else if (bundleState == Bundle.INSTALLED)
-                bundleStateString = "INSTALLED";
-            else if (bundleState == Bundle.RESOLVED)
-                bundleStateString = "RESOLVED";
-            else if (bundleState == Bundle.STARTING)
-                bundleStateString = "STARTING";
-            else if (bundleState == Bundle.STOPPING)
-                bundleStateString = "STOPPING";
-            else bundleStateString = "UNKNOWN";
-            CompositeData data = new CompositeDataSupport(bundleType,
-                    new String[]{ "ID", "Name", "Version", "Start Level", "State" },
-                    new Object[]{ bundles[i].getBundleId(), bundles[i].getSymbolicName(), bundles[i].getVersion().toString(), bundleStartLevel, bundleStateString });
-            table.put(data);
+            try {
+                int bundleStartLevel = getBundleStartLevel(bundles[i]).getStartLevel();
+                int bundleState = bundles[i].getState();
+                String bundleStateString;
+                if (bundleState == Bundle.ACTIVE)
+                    bundleStateString = "ACTIVE";
+                else if (bundleState == Bundle.INSTALLED)
+                    bundleStateString = "INSTALLED";
+                else if (bundleState == Bundle.RESOLVED)
+                    bundleStateString = "RESOLVED";
+                else if (bundleState == Bundle.STARTING)
+                    bundleStateString = "STARTING";
+                else if (bundleState == Bundle.STOPPING)
+                    bundleStateString = "STOPPING";
+                else bundleStateString = "UNKNOWN";
+                CompositeData data = new CompositeDataSupport(bundleType,
+                        new String[]{"ID", "Name", "Version", "Start Level", "State"},
+                        new Object[]{bundles[i].getBundleId(), bundles[i].getSymbolicName(), bundles[i].getVersion().toString(), bundleStartLevel, bundleStateString});
+                table.put(data);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
         }
         return table;
     }

Modified: karaf/trunk/management/mbeans/http/src/main/java/org/apache/karaf/management/mbeans/http/internal/HttpMBeanImpl.java
URL: http://svn.apache.org/viewvc/karaf/trunk/management/mbeans/http/src/main/java/org/apache/karaf/management/mbeans/http/internal/HttpMBeanImpl.java?rev=1298314&r1=1298313&r2=1298314&view=diff
==============================================================================
--- karaf/trunk/management/mbeans/http/src/main/java/org/apache/karaf/management/mbeans/http/internal/HttpMBeanImpl.java (original)
+++ karaf/trunk/management/mbeans/http/src/main/java/org/apache/karaf/management/mbeans/http/internal/HttpMBeanImpl.java Thu Mar  8 09:22:49 2012
@@ -41,53 +41,57 @@ public class HttpMBeanImpl extends Stand
     public TabularData getServlets() throws Exception {
         Collection<ServletEvent> events = servletEventHandler.getServletEvents();
         CompositeType servletType = new CompositeType("Servlet", "HTTP Servlet",
-                new String[]{ "ID", "Servlet", "Servlet Name", "State", "Alias", "URL" },
-                new String[]{ "ID of the servlet", "Class name of the servlet", "Servlet Name", "Current state of the servlet", "Aliases of the servlet", "URL of the servlet" },
-                new OpenType[]{SimpleType.STRING,  SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING });
-        TabularType tableType = new TabularType("Servlets", "Table of all HTTP servlets", servletType, new String[]{ "ID" });
+                new String[]{"ID", "Servlet", "Servlet Name", "State", "Alias", "URL"},
+                new String[]{"ID of the servlet", "Class name of the servlet", "Servlet Name", "Current state of the servlet", "Aliases of the servlet", "URL of the servlet"},
+                new OpenType[]{SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING});
+        TabularType tableType = new TabularType("Servlets", "Table of all HTTP servlets", servletType, new String[]{"ID"});
         TabularData table = new TabularDataSupport(tableType);
 
         for (ServletEvent event : events) {
-            Servlet servlet = event.getServlet();
-			String servletClassName = " ";
-			if (servlet != null) {
-				servletClassName = servlet.getClass().getName();
-				servletClassName = servletClassName.substring(servletClassName.lastIndexOf(".")+1, servletClassName.length());
-			}
-			String servletName = event.getServletName() != null ? event.getServletName() : " ";
-			if (servletName.contains(".")) {
-				servletName = servletName.substring(servletName.lastIndexOf(".")+1, servletName.length());
-			}
-
-			String alias = event.getAlias() != null ? event.getAlias() : " ";
-
-			String[] urls = (String[]) (event.getUrlParameter() != null ? event.getUrlParameter() : new String[] {""});
-
-            CompositeData data = new CompositeDataSupport(servletType,
-                    new String[]{ "ID", "Servlet", "Servlet Name", "State", "Alias", "URL" },
-                    new Object[]{ event.getBundle().getBundleId(), servletClassName, servletName, getStateString(event.getType()), alias, Arrays.toString(urls) });
-            table.put(data);
+            try {
+                Servlet servlet = event.getServlet();
+                String servletClassName = " ";
+                if (servlet != null) {
+                    servletClassName = servlet.getClass().getName();
+                    servletClassName = servletClassName.substring(servletClassName.lastIndexOf(".") + 1, servletClassName.length());
+                }
+                String servletName = event.getServletName() != null ? event.getServletName() : " ";
+                if (servletName.contains(".")) {
+                    servletName = servletName.substring(servletName.lastIndexOf(".") + 1, servletName.length());
+                }
+
+                String alias = event.getAlias() != null ? event.getAlias() : " ";
+
+                String[] urls = (String[]) (event.getUrlParameter() != null ? event.getUrlParameter() : new String[]{""});
+
+                CompositeData data = new CompositeDataSupport(servletType,
+                        new String[]{"ID", "Servlet", "Servlet Name", "State", "Alias", "URL"},
+                        new Object[]{event.getBundle().getBundleId(), servletClassName, servletName, getStateString(event.getType()), alias, Arrays.toString(urls)});
+                table.put(data);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
         }
         return table;
     }
 
-	private String getStateString(int type) {
-        switch(type) {
-		case WebEvent.DEPLOYING:
-			return "Deploying  ";
-		case WebEvent.DEPLOYED:
-			return "Deployed   ";
-		case WebEvent.UNDEPLOYING:
-			return "Undeploying";
-		case WebEvent.UNDEPLOYED:
-			return "Undeployed ";
-		case WebEvent.FAILED:
-			return "Failed     ";
-		case WebEvent.WAITING:
-			return "Waiting    ";
-		default:
-			return "Failed     ";
-		}
+    private String getStateString(int type) {
+        switch (type) {
+            case WebEvent.DEPLOYING:
+                return "Deploying  ";
+            case WebEvent.DEPLOYED:
+                return "Deployed   ";
+            case WebEvent.UNDEPLOYING:
+                return "Undeploying";
+            case WebEvent.UNDEPLOYED:
+                return "Undeployed ";
+            case WebEvent.FAILED:
+                return "Failed     ";
+            case WebEvent.WAITING:
+                return "Waiting    ";
+            default:
+                return "Failed     ";
+        }
     }
 
     public ServletEventHandler getServletEventHandler() {

Modified: karaf/trunk/management/mbeans/obr/src/main/java/org/apache/karaf/management/mbeans/obr/internal/ObrMBeanImpl.java
URL: http://svn.apache.org/viewvc/karaf/trunk/management/mbeans/obr/src/main/java/org/apache/karaf/management/mbeans/obr/internal/ObrMBeanImpl.java?rev=1298314&r1=1298313&r2=1298314&view=diff
==============================================================================
--- karaf/trunk/management/mbeans/obr/src/main/java/org/apache/karaf/management/mbeans/obr/internal/ObrMBeanImpl.java (original)
+++ karaf/trunk/management/mbeans/obr/src/main/java/org/apache/karaf/management/mbeans/obr/internal/ObrMBeanImpl.java Thu Mar  8 09:22:49 2012
@@ -54,19 +54,23 @@ public class ObrMBeanImpl extends Standa
 
     public TabularData getBundles() throws Exception {
         CompositeType bundleType = new CompositeType("OBR Resource", "Bundle available in the OBR",
-                new String[]{ "presentationname", "symbolicname", "version" },
-                new String[]{ "Presentation Name", "Symbolic Name", "Version" },
-                new OpenType[]{ SimpleType.STRING, SimpleType.STRING, SimpleType.STRING });
+                new String[]{"presentationname", "symbolicname", "version"},
+                new String[]{"Presentation Name", "Symbolic Name", "Version"},
+                new OpenType[]{SimpleType.STRING, SimpleType.STRING, SimpleType.STRING});
         TabularType tableType = new TabularType("OBR Resources", "Table of all resources/bundles available in the OBR",
-                bundleType, new String[]{ "presentationname" });
+                bundleType, new String[]{"presentationname"});
         TabularData table = new TabularDataSupport(tableType);
 
         Resource[] resources = repositoryAdmin.discoverResources("(|(presentationname=*)(symbolicname=*))");
         for (int i = 0; i < resources.length; i++) {
-            CompositeData data = new CompositeDataSupport(bundleType,
-                    new String[]{ "presentationname", "symbolicname", "version" },
-                    new Object[]{ resources[i].getPresentationName(), resources[i].getSymbolicName(), resources[i].getVersion() });
-            table.put(data);
+            try {
+                CompositeData data = new CompositeDataSupport(bundleType,
+                        new String[]{"presentationname", "symbolicname", "version"},
+                        new Object[]{resources[i].getPresentationName(), resources[i].getSymbolicName(), resources[i].getVersion()});
+                table.put(data);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
         }
 
         return table;
@@ -96,8 +100,8 @@ public class ObrMBeanImpl extends Standa
             throw new IllegalArgumentException("Unknown bundle " + target[0]);
         }
         resolver.add(resource);
-       if ((resolver.getAddedResources() != null) &&
-            (resolver.getAddedResources().length > 0)) {
+        if ((resolver.getAddedResources() != null) &&
+                (resolver.getAddedResources().length > 0)) {
         }
         if (resolver.resolve()) {
             Resource[] resources = resolver.getAddedResources();
@@ -159,11 +163,9 @@ public class ObrMBeanImpl extends Standa
         String[] target;
         int idx = bundle.indexOf(VERSION_DELIM);
         if (idx > 0) {
-            target = new String[] { bundle.substring(0, idx), bundle.substring(idx+1) };
-        }
-        else
-        {
-            target = new String[] { bundle, null };
+            target = new String[]{bundle.substring(0, idx), bundle.substring(idx + 1)};
+        } else {
+            target = new String[]{bundle, null};
         }
         return target;
     }

Modified: karaf/trunk/management/mbeans/services/src/main/java/org/apache/karaf/management/mbeans/services/internal/ServicesMBeanImpl.java
URL: http://svn.apache.org/viewvc/karaf/trunk/management/mbeans/services/src/main/java/org/apache/karaf/management/mbeans/services/internal/ServicesMBeanImpl.java?rev=1298314&r1=1298313&r2=1298314&view=diff
==============================================================================
--- karaf/trunk/management/mbeans/services/src/main/java/org/apache/karaf/management/mbeans/services/internal/ServicesMBeanImpl.java (original)
+++ karaf/trunk/management/mbeans/services/src/main/java/org/apache/karaf/management/mbeans/services/internal/ServicesMBeanImpl.java Thu Mar  8 09:22:49 2012
@@ -52,38 +52,42 @@ public class ServicesMBeanImpl extends S
 
     public TabularData getServices(long bundleId, boolean inUse) throws Exception {
         CompositeType serviceType = new CompositeType("Service", "OSGi Service",
-                new String[]{ "Interfaces", "Properties" },
-                new String[]{ "Interfaces class name of the service", "Properties of the service" },
-                new OpenType[]{ new ArrayType(1, SimpleType.STRING), new ArrayType(1, SimpleType.STRING) });
+                new String[]{"Interfaces", "Properties"},
+                new String[]{"Interfaces class name of the service", "Properties of the service"},
+                new OpenType[]{new ArrayType(1, SimpleType.STRING), new ArrayType(1, SimpleType.STRING)});
         TabularType tableType = new TabularType("Services", "Table of OSGi Services", serviceType,
-                new String[]{ "Interfaces" });
+                new String[]{"Interfaces"});
         TabularData table = new TabularDataSupport(tableType);
 
         Bundle[] bundles;
         if (bundleId >= 0) {
-            bundles = new Bundle[]{ bundleContext.getBundle(bundleId) };
+            bundles = new Bundle[]{bundleContext.getBundle(bundleId)};
         } else {
             bundles = bundleContext.getBundles();
         }
-        for (Bundle bundle : bundles) {;
-            ServiceReference[] serviceReferences;
-            if (inUse) {
-                serviceReferences = bundle.getServicesInUse();
-            } else {
-                serviceReferences = bundle.getRegisteredServices();
-            }
-            if (serviceReferences != null) {
-                for (ServiceReference reference : serviceReferences) {
-                    String[] interfaces = (String[]) reference.getProperty("objectClass");
-                    List<String> properties = new ArrayList<String>();
-                    for (String key : reference.getPropertyKeys()) {
-                        properties.add(key + " = " + reference.getProperty(key));
+        for (Bundle bundle : bundles) {
+            try {
+                ServiceReference[] serviceReferences;
+                if (inUse) {
+                    serviceReferences = bundle.getServicesInUse();
+                } else {
+                    serviceReferences = bundle.getRegisteredServices();
+                }
+                if (serviceReferences != null) {
+                    for (ServiceReference reference : serviceReferences) {
+                        String[] interfaces = (String[]) reference.getProperty("objectClass");
+                        List<String> properties = new ArrayList<String>();
+                        for (String key : reference.getPropertyKeys()) {
+                            properties.add(key + " = " + reference.getProperty(key));
+                        }
+                        CompositeData data = new CompositeDataSupport(serviceType,
+                                new String[]{"Interfaces", "Properties"},
+                                new Object[]{interfaces, properties.toArray(new String[0])});
+                        table.put(data);
                     }
-                    CompositeData data = new CompositeDataSupport(serviceType,
-                        new String[]{ "Interfaces", "Properties" },
-                        new Object[]{ interfaces, properties.toArray(new String[0]) });
-                    table.put(data);
                 }
+            } catch (Exception e) {
+                e.printStackTrace();
             }
         }
         return table;

Modified: karaf/trunk/web/management/src/main/java/org/apache/karaf/web/management/internal/WebMBeanImpl.java
URL: http://svn.apache.org/viewvc/karaf/trunk/web/management/src/main/java/org/apache/karaf/web/management/internal/WebMBeanImpl.java?rev=1298314&r1=1298313&r2=1298314&view=diff
==============================================================================
--- karaf/trunk/web/management/src/main/java/org/apache/karaf/web/management/internal/WebMBeanImpl.java (original)
+++ karaf/trunk/web/management/src/main/java/org/apache/karaf/web/management/internal/WebMBeanImpl.java Thu Mar  8 09:22:49 2012
@@ -29,9 +29,9 @@ import java.util.List;
  * Implementation of the web MBean.
  */
 public class WebMBeanImpl extends StandardMBean implements WebMBean {
-    
+
     private WebContainerService webContainerService;
-    
+
     public WebMBeanImpl() throws NotCompliantMBeanException {
         super(WebMBean.class);
     }
@@ -42,38 +42,41 @@ public class WebMBeanImpl extends Standa
 
     public TabularData getWebBundles() throws Exception {
         CompositeType webType = new CompositeType("Web Bundle", "An OSGi Web bundle",
-                new String[]{ "ID", "State", "Web-State", "Level", "Web-ContextPath", "Name" },
-                new String[]{ "ID of the bundle", 
+                new String[]{"ID", "State", "Web-State", "Level", "Web-ContextPath", "Name"},
+                new String[]{"ID of the bundle",
                         "OSGi state of the bundle",
-                        "Web state of the bundle", 
-                        "Start level of the bundle", 
+                        "Web state of the bundle",
+                        "Start level of the bundle",
                         "Web context path",
-                        "Name of the bundle" },
-                new OpenType[]{ SimpleType.STRING, SimpleType.STRING, SimpleType.STRING });
+                        "Name of the bundle"},
+                new OpenType[]{SimpleType.STRING, SimpleType.STRING, SimpleType.STRING});
         TabularType tableType = new TabularType("Web Bundles", "Table of web bundles", webType,
-                new String[]{ "ID" });
+                new String[]{"ID"});
         TabularData table = new TabularDataSupport(tableType);
         for (WebBundle webBundle : webContainerService.list()) {
-            
-            CompositeData data = new CompositeDataSupport(webType,
-                    new String[]{ "ID", "State", "Web-State", "Level", "Web-ContextPath", "Name"},
-                    new Object[]{ webBundle.getBundleId(),
-                            webBundle.getState(),
-                            webBundle.getWebState(),
-                            webBundle.getLevel(),
-                            webBundle.getContextPath(),
-                            webBundle.getName() });
-            table.put(data);
+            try {
+                CompositeData data = new CompositeDataSupport(webType,
+                        new String[]{"ID", "State", "Web-State", "Level", "Web-ContextPath", "Name"},
+                        new Object[]{webBundle.getBundleId(),
+                                webBundle.getState(),
+                                webBundle.getWebState(),
+                                webBundle.getLevel(),
+                                webBundle.getContextPath(),
+                                webBundle.getName()});
+                table.put(data);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
         }
         return table;
-    } 
-    
+    }
+
     public void start(List<Long> bundleIds) throws Exception {
         webContainerService.start(bundleIds);
     }
-    
+
     public void stop(List<Long> bundleIds) throws Exception {
         webContainerService.stop(bundleIds);
     }
-    
+
 }