commit 425df8e1b23accfb1c309bdc37418afc3b42a47d
author Carsten Ziegeler <cziegeler@apache.org> Wed Mar 23 17:19:02 2016 +0000
committer Carsten Ziegeler <cziegeler@apache.org> Wed Mar 23 17:19:02 2016 +0000
tree e333c6abf559fb8c45b98747e769482f8ca13fb4
parent df633af1daaa25ed6aba7815b746db741a9053a9

SLING-5626 : Start level for bundles in the boot section is not correctly set on update

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1736355 13f79535-47bb-0310-9956-ffa450edef68

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

diff --git a/src/main/java/org/apache/sling/launchpad/base/impl/BootstrapInstaller.java b/src/main/java/org/apache/sling/launchpad/base/impl/BootstrapInstaller.java
index 84ec9ce..de04fd9 100644
--- a/src/main/java/org/apache/sling/launchpad/base/impl/BootstrapInstaller.java
+++ b/src/main/java/org/apache/sling/launchpad/base/impl/BootstrapInstaller.java
@@ -488,6 +488,12 @@
                 logger.log(Logger.LOG_INFO, "Bundle "
                     + installedBundle.getSymbolicName()
                     + " updated from " + bundleJar);
+
+                // optionally set the start level
+                if (startLevel > 0) {
+                    startLevelService.setBundleStartLevel(installedBundle,
+                        startLevel);
+                }
             } catch (BundleException be) {
                 logger.log(Logger.LOG_ERROR, "Bundle update from "
                     + bundleJar + " failed", be);
@@ -568,7 +574,7 @@
     }
 
     private boolean isSystemBundleFragment(final Bundle installedBundle) {
-        final String fragmentHeader = (String) installedBundle.getHeaders().get(
+        final String fragmentHeader = installedBundle.getHeaders().get(
             Constants.FRAGMENT_HOST);
         return fragmentHeader != null
             && fragmentHeader.indexOf(Constants.EXTENSION_DIRECTIVE) > 0;
@@ -639,7 +645,7 @@
             Constants.BUNDLE_VERSION);
         Version newVersion = Version.parseVersion(versionProp);
 
-        String installedVersionProp = (String) installedBundle.getHeaders().get(
+        String installedVersionProp = installedBundle.getHeaders().get(
             Constants.BUNDLE_VERSION);
         Version installedVersion = Version.parseVersion(installedVersionProp);
 
@@ -675,7 +681,7 @@
      *         fails for some reason
      */
     private boolean isNewerSnapshot(final Bundle installedBundle, final Manifest manifest) {
-        String installedDate = (String) installedBundle.getHeaders().get(
+        String installedDate = installedBundle.getHeaders().get(
             BND_LAST_MODIFIED_HEADER);
         String toBeInstalledDate = manifest.getMainAttributes().getValue(
             BND_LAST_MODIFIED_HEADER);