FELIX-2405: Restarting the framework from the web console (or using update on the system bundle) does not work
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@906851 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java b/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java
index 3dee90a..453c8d0 100644
--- a/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java
+++ b/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java
@@ -41,6 +41,7 @@
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
+import org.osgi.framework.FrameworkEvent;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.launch.Framework;
import org.osgi.framework.launch.FrameworkFactory;
@@ -225,7 +226,12 @@
}
try {
if (await) {
- framework.waitForStop(0);
+ while (true) {
+ FrameworkEvent event = framework.waitForStop(0);
+ if (event.getType() != FrameworkEvent.STOPPED_UPDATE) {
+ break;
+ }
+ }
}
exiting = true;
if (framework.getState() == Bundle.ACTIVE) {