Author: thomas.diesler(a)jboss.com Date: 2010-02-24 15:36:12 -0500 (Wed, 24 Feb 2010) New Revision: 101424 Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/internal/BundleStateExt.java projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/RemoteBundle.java Log: Allign return values & prevent NPEs Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/internal/BundleStateExt.java =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/internal/BundleStateExt.java 2010-02-24 20:25:46 UTC (rev 101423) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/internal/BundleStateExt.java 2010-02-24 20:36:12 UTC (rev 101424) @@ -93,7 +93,7 @@ { BundleContext context = assertBundleContext(bundleId); File dataFile = context.getDataFile(filename); - return dataFile.getCanonicalPath(); + return dataFile != null ? dataFile.getCanonicalPath() : null; } @Override @@ -101,10 +101,18 @@ { Bundle bundle = assertBundle(bundleId); URL entry = bundle.getEntry(path); - return entry.toExternalForm(); + return entry != null ? entry.toExternalForm() : null; } @Override + public String getResource(long bundleId, String name) throws IOException + { + Bundle bundle = assertBundle(bundleId); + URL resource = bundle.getResource(name); + return resource != null ? resource.toExternalForm() : null; + } + + @Override @SuppressWarnings("unchecked") public TabularData getHeaders(long bundleId, String locale) throws IOException { @@ -147,14 +155,6 @@ } @Override - public String getResource(long bundleId, String name) throws IOException - { - Bundle bundle = assertBundle(bundleId); - URL entry = bundle.getResource(name); - return entry.toExternalForm(); - } - - @Override public long loadClass(long bundleId, String name) throws ClassNotFoundException, IOException { Bundle bundle = assertBundle(bundleId); @@ -162,10 +162,7 @@ ServiceReference sref = context.getServiceReference(PackageAdmin.class.getName()); PackageAdmin service = (PackageAdmin)context.getService(sref); Bundle exporter = service.getBundle(clazz); - if (exporter == null) - return 0; - - return exporter.getBundleId(); + return exporter != null ? exporter.getBundleId() : 0; } public String[] getExportedPackages(long arg0) throws IOException Modified: projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/RemoteBundle.java =================================================================== --- projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/RemoteBundle.java 2010-02-24 20:25:46 UTC (rev 101423) +++ projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/RemoteBundle.java 2010-02-24 20:36:12 UTC (rev 101424) @@ -251,7 +251,8 @@ assertNotUninstalled(); try { - return new File(bundleState.getDataFile(bundleId, filename)); + String filepath = bundleState.getDataFile(bundleId, filename); + return filepath != null ? new File(filepath) : null; } catch (IOException ex) {