commit f3b86ac32208017d21a9e1d62c629b3ca8a92720
author Karl Pauls <karlpauls@gmail.com> Fri Aug 31 14:55:50 2018 +0200
committer Karl Pauls <karlpauls@gmail.com> Fri Aug 31 14:55:50 2018 +0200
tree e7c4ad0cefaadac8e3c19c6759f8dbcb7cc477b1
parent 17d14dcdb0bbcfb441df4e521b722f2cb4440c27

SLING-7876: take framework restarts due to extension bundle refresh into account.

src/main/java/org/apache/sling/launchpad/base/impl/SlingFelix.java

diff --git a/src/main/java/org/apache/sling/launchpad/base/impl/SlingFelix.java b/src/main/java/org/apache/sling/launchpad/base/impl/SlingFelix.java
index 66bb354..373c060 100644
--- a/src/main/java/org/apache/sling/launchpad/base/impl/SlingFelix.java
+++ b/src/main/java/org/apache/sling/launchpad/base/impl/SlingFelix.java
@@ -31,6 +31,7 @@
 import org.apache.sling.launchpad.base.shared.Notifiable;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleException;
+import org.osgi.framework.FrameworkEvent;
 
 
 public class SlingFelix extends Felix {
@@ -164,9 +165,11 @@
 
         @Override
         public void run() {
-
+            boolean restart = this.restart;
             try {
-                SlingFelix.this.waitForStop(0);
+                if (SlingFelix.this.waitForStop(0).getType() == FrameworkEvent.STOPPED_SYSTEM_REFRESHED) {
+                    restart = true;
+                }
             } catch (InterruptedException ie) {
                 Thread.currentThread().interrupt();
             }