You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by gn...@apache.org on 2011/01/19 10:43:32 UTC
svn commit: r1060731 - in /felix/trunk/framework/src:
main/java/org/apache/felix/framework/Felix.java
test/java/org/apache/felix/framework/StartStopBundleTest.java
Author: gnodet
Date: Wed Jan 19 09:43:32 2011
New Revision: 1060731
URL: http://svn.apache.org/viewvc?rev=1060731&view=rev
Log:
[FELIX-1581] Bundle#update, Bundle#uninstall and Bundle#stop should wait for a (configurable) timeout before throwing an exception if the bundle is starting or stopping
Added:
felix/trunk/framework/src/test/java/org/apache/felix/framework/StartStopBundleTest.java
Modified:
felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java
Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java?rev=1060731&r1=1060730&r2=1060731&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java Wed Jan 19 09:43:32 2011
@@ -1622,7 +1622,7 @@ public class Felix extends BundleImpl im
try
{
acquireBundleLock(bundle,
- Bundle.INSTALLED | Bundle.RESOLVED | Bundle.STARTING | Bundle.ACTIVE);
+ Bundle.INSTALLED | Bundle.RESOLVED | Bundle.STARTING | Bundle.ACTIVE | Bundle.STOPPING);
}
catch (IllegalStateException ex)
{
@@ -2119,7 +2119,7 @@ public class Felix extends BundleImpl im
try
{
acquireBundleLock(bundle,
- Bundle.INSTALLED | Bundle.RESOLVED | Bundle.STARTING | Bundle.ACTIVE);
+ Bundle.INSTALLED | Bundle.RESOLVED | Bundle.STARTING | Bundle.ACTIVE | Bundle.STOPPING);
}
catch (IllegalStateException ex)
{
@@ -2273,7 +2273,7 @@ public class Felix extends BundleImpl im
try
{
acquireBundleLock(bundle,
- Bundle.INSTALLED | Bundle.RESOLVED | Bundle.STARTING | Bundle.ACTIVE);
+ Bundle.INSTALLED | Bundle.RESOLVED | Bundle.STARTING | Bundle.ACTIVE | Bundle.STOPPING);
}
catch (IllegalStateException ex)
{
Added: felix/trunk/framework/src/test/java/org/apache/felix/framework/StartStopBundleTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/test/java/org/apache/felix/framework/StartStopBundleTest.java?rev=1060731&view=auto
==============================================================================
--- felix/trunk/framework/src/test/java/org/apache/felix/framework/StartStopBundleTest.java (added)
+++ felix/trunk/framework/src/test/java/org/apache/felix/framework/StartStopBundleTest.java Wed Jan 19 09:43:32 2011
@@ -0,0 +1,146 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.felix.framework;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.CountDownLatch;
+import java.util.jar.JarOutputStream;
+import java.util.jar.Manifest;
+import java.util.zip.ZipEntry;
+
+import junit.framework.TestCase;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleException;
+import org.osgi.framework.Constants;
+import org.osgi.framework.launch.Framework;
+
+public class StartStopBundleTest extends TestCase {
+
+ public static final int DELAY = 1000;
+
+ private File cacheDir;
+
+ public void testStartStopBundle() throws Exception
+ {
+ Map params = new HashMap();
+ params.put(Constants.FRAMEWORK_SYSTEMPACKAGES,
+ "org.osgi.framework; version=1.4.0,"
+ + "org.osgi.service.packageadmin; version=1.2.0,"
+ + "org.osgi.service.startlevel; version=1.1.0,"
+ + "org.osgi.util.tracker; version=1.3.3,"
+ + "org.osgi.service.url; version=1.0.0");
+ cacheDir = File.createTempFile("felix-cache", ".dir");
+ cacheDir.delete();
+ cacheDir.mkdirs();
+ String cache = cacheDir.getPath();
+ params.put("felix.cache.profiledir", cache);
+ params.put("felix.cache.dir", cache);
+ params.put(Constants.FRAMEWORK_STORAGE, cache);
+
+ String mf = "Bundle-SymbolicName: boot.test\n"
+ + "Bundle-Version: 1.1.0\n"
+ + "Bundle-ManifestVersion: 2\n"
+ + "Import-Package: org.osgi.framework\n";
+ File bundleFile = createBundle(mf);
+
+ Framework f = new Felix(params);
+ f.init();
+ f.start();
+
+ final Bundle bundle = f.getBundleContext().installBundle(bundleFile.toURI().toString());
+ final CountDownLatch latch = new CountDownLatch(1);
+
+ new Thread() {
+ public void run() {
+ try {
+ bundle.start();
+ } catch (BundleException e) {
+ e.printStackTrace();
+ }
+ }
+ }.start();
+ Thread.sleep(DELAY / 4);
+ long t0 = System.currentTimeMillis();
+ bundle.stop();
+ long t1 = System.currentTimeMillis();
+
+ assertEquals(Bundle.RESOLVED, bundle.getState());
+ assertTrue((t1 -t0) > DELAY / 2);
+
+ bundle.start();
+
+ new Thread() {
+ public void run() {
+ try {
+ bundle.stop();
+ } catch (BundleException e) {
+ e.printStackTrace();
+ }
+ }
+ }.start();
+ Thread.sleep(DELAY / 4);
+ t0 = System.currentTimeMillis();
+ bundle.start();
+ t1 = System.currentTimeMillis();
+
+ assertEquals(Bundle.ACTIVE, bundle.getState());
+ assertTrue((t1 -t0) > DELAY / 2);
+ }
+
+ private static File createBundle(String manifest) throws IOException
+ {
+ File f = File.createTempFile("felix-bundle", ".jar");
+ f.deleteOnExit();
+
+ Manifest mf = new Manifest(new ByteArrayInputStream(manifest.getBytes("utf-8")));
+ mf.getMainAttributes().putValue("Manifest-Version", "1.0");
+ mf.getMainAttributes().putValue(Constants.BUNDLE_ACTIVATOR, TestBundleActivator.class.getName());
+ JarOutputStream os = new JarOutputStream(new FileOutputStream(f), mf);
+
+ String path = TestBundleActivator.class.getName().replace('.', '/') + ".class";
+ os.putNextEntry(new ZipEntry(path));
+
+ InputStream is = TestBundleActivator.class.getClassLoader().getResourceAsStream(path);
+ byte[] b = new byte[is.available()];
+ is.read(b);
+ is.close();
+ os.write(b);
+
+ os.close();
+ return f;
+ }
+
+ public static class TestBundleActivator implements BundleActivator {
+ public void start(BundleContext context) throws Exception {
+ Thread.sleep(DELAY);
+ }
+ public void stop(BundleContext context) throws Exception {
+ Thread.sleep(DELAY);
+ }
+ }
+
+}