[sling-org-apache-sling-launchpad-base] branch master updated: SLING-7876: take framework restarts due to extension bundle refresh into account.

[pauls]

This is an automated email from the ASF dual-hosted git repository.

pauls pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-base.git


The following commit(s) were added to refs/heads/master by this push:
     new f3b86ac  SLING-7876: take framework restarts due to extension bundle 
refresh into account.
f3b86ac is described below

commit f3b86ac32208017d21a9e1d62c629b3ca8a92720
Author: Karl Pauls <karlpa...@gmail.com>
AuthorDate: Fri Aug 31 14:55:50 2018 +0200

    SLING-7876: take framework restarts due to extension bundle refresh into 
account.
---
 src/main/java/org/apache/sling/launchpad/base/impl/SlingFelix.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

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.Loader;
 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 @@ public class SlingFelix extends Felix {
 
         @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();
             }