You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by aw...@apache.org on 2009/12/03 00:22:20 UTC
svn commit: r886338 - in /incubator/aries/trunk/jmx/jmx-core/src:
main/java/org/apache/aries/jmx/framework/Framework.java
main/java/org/apache/aries/jmx/framework/PackageState.java
test/java/org/apache/aries/jmx/framework/FrameworkTest.java
Author: awojtuniak
Date: Wed Dec 2 23:22:19 2009
New Revision: 886338
URL: http://svn.apache.org/viewvc?rev=886338&view=rev
Log:
Fixed couple bugs in Framework and PackageState MBeans
Modified:
incubator/aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/Framework.java
incubator/aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/PackageState.java
incubator/aries/trunk/jmx/jmx-core/src/test/java/org/apache/aries/jmx/framework/FrameworkTest.java
Modified: incubator/aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/Framework.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/Framework.java?rev=886338&r1=886337&r2=886338&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/Framework.java (original)
+++ incubator/aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/Framework.java Wed Dec 2 23:22:19 2009
@@ -146,7 +146,6 @@
}
long[] ids = new long[locations.length];
for (int i = 0; i < locations.length; i++) {
- // check index
try {
long id = installBundle(locations[i], urls[i]);
ids[i] = id;
@@ -284,7 +283,7 @@
* @see org.osgi.jmx.framework.FrameworkMBean#startBundle(long)
*/
public void startBundle(long bundleIdentifier) throws IOException {
- Bundle bundle = context.getBundle(bundleIdentifier);
+ Bundle bundle = getBundle(bundleIdentifier);
if (bundle != null) {
try {
bundle.start();
@@ -315,7 +314,7 @@
* @see org.osgi.jmx.framework.FrameworkMBean#stopBundle(long)
*/
public void stopBundle(long bundleIdentifier) throws IOException {
- Bundle bundle = context.getBundle(bundleIdentifier);
+ Bundle bundle = getBundle(bundleIdentifier);
if (bundle != null) {
try {
bundle.stop();
@@ -414,9 +413,9 @@
* @see org.osgi.jmx.framework.FrameworkMBean#updateBundles(long[])
*/
public CompositeData updateBundles(long[] bundleIdentifiers) throws IOException {
- if(bundleIdentifiers == null){
- return new BatchActionResult("Failed to update bundles, bundle id's can't be null").toCompositeData();
- }
+ if (bundleIdentifiers == null) {
+ return new BatchActionResult("Failed to update bundles, bundle id's can't be null").toCompositeData();
+ }
for (int i = 0; i < bundleIdentifiers.length; i++) {
try {
updateBundle(bundleIdentifiers[i]);
Modified: incubator/aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/PackageState.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/PackageState.java?rev=886338&r1=886337&r2=886338&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/PackageState.java (original)
+++ incubator/aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/PackageState.java Wed Dec 2 23:22:19 2009
@@ -120,8 +120,10 @@
Set<Package> packages = new HashSet<Package>();
for (Bundle bundle : context.getBundles()) {
ExportedPackage[] exportedPackages = packageAdmin.getExportedPackages(bundle);
- for (ExportedPackage exportedPackage : exportedPackages) {
- packages.add(new Package(exportedPackage));
+ if (exportedPackages != null) {
+ for (ExportedPackage exportedPackage : exportedPackages) {
+ packages.add(new Package(exportedPackage));
+ }
}
}
Modified: incubator/aries/trunk/jmx/jmx-core/src/test/java/org/apache/aries/jmx/framework/FrameworkTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-core/src/test/java/org/apache/aries/jmx/framework/FrameworkTest.java?rev=886338&r1=886337&r2=886338&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-core/src/test/java/org/apache/aries/jmx/framework/FrameworkTest.java (original)
+++ incubator/aries/trunk/jmx/jmx-core/src/test/java/org/apache/aries/jmx/framework/FrameworkTest.java Wed Dec 2 23:22:19 2009
@@ -305,6 +305,14 @@
} catch (IOException ioe) {
// expected
}
+
+ Mockito.when(context.getBundle(6)).thenReturn(null);
+ try {
+ mbean.startBundle(6);
+ Assert.fail("IllegalArgumentException should be thrown");
+ } catch (IllegalArgumentException iae) {
+ //expected
+ }
}
@Test
@@ -335,6 +343,15 @@
Mockito.when(context.getBundle(5)).thenReturn(bundle);
mbean.stopBundle(5);
Mockito.verify(bundle).stop();
+
+ Mockito.when(context.getBundle(5)).thenReturn(null);
+ try {
+ mbean.stopBundle(5);
+ Assert.fail("IllegalArgumentException should be thrown");
+ } catch (IllegalArgumentException iae) {
+ //expected
+ }
+
}
@Test