You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 09:53:34 UTC

[sling-org-apache-sling-launchpad-installer] 09/11: SLING-2649 : Add support for run modes

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

rombert pushed a commit to annotated tag org.apache.sling.launchpad.installer-1.2.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-installer.git

commit 19cc1433bb0a9ac89b435018e30ce13eea0c5d85
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Nov 16 07:28:24 2012 +0000

    SLING-2649 : Add support for run modes
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/launchpad/installer@1410218 13f79535-47bb-0310-9956-ffa450edef68
---
 .../launchpad/installer/impl/LaunchpadConfigInstaller.java   | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/apache/sling/launchpad/installer/impl/LaunchpadConfigInstaller.java b/src/main/java/org/apache/sling/launchpad/installer/impl/LaunchpadConfigInstaller.java
index 477e245..f953502 100644
--- a/src/main/java/org/apache/sling/launchpad/installer/impl/LaunchpadConfigInstaller.java
+++ b/src/main/java/org/apache/sling/launchpad/installer/impl/LaunchpadConfigInstaller.java
@@ -72,7 +72,7 @@ public class LaunchpadConfigInstaller {
      */
     private boolean checkPath(final String rootPath,
             final String resourceType,
-            final Integer prio) {
+            Integer prio) {
         int count = 0;
 
         final Iterator<String> configPaths = resourceProvider.getChildren(rootPath);
@@ -100,9 +100,13 @@ public class LaunchpadConfigInstaller {
                         } catch (final URISyntaxException e) {
                             // we just ignore this
                         }
-                    } else if ( !hint.equals(CONFIG_NAME) && isActive(hint) == 0 ) {
-                        logger.debug("Launchpad ignoring {} : {} due to unactivated run mode: {}", new Object[] {resourceType, path, hint});
-                        continue;
+                    } else if ( !hint.equals(CONFIG_NAME) ) {
+                        final int activeModes = isActive(hint);
+                        if ( activeModes == 0 ) {
+                            logger.debug("Launchpad ignoring {} : {} due to unactivated run mode: {}", new Object[] {resourceType, path, hint});
+                            continue;
+                        }
+                        prio = PRIORITY + PRIORITY_BOOST * activeModes;
                     }
                     long lastModified = -1;
                     try {

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.