sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From romb...@apache.org
Subject [sling-org-apache-sling-installer-hc] 03/11: SLING-5888 fix emitted warnings and only count those configurations/bundles which have been actually checked
Date Wed, 18 Oct 2017 23:27:08 GMT
This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-hc.git

commit 9022d2b820c68ebe91633d49c0293e1615303dd3
Author: Konrad Windszus <kwin@apache.org>
AuthorDate: Thu Aug 18 13:02:46 2016 +0000

    SLING-5888 fix emitted warnings and only count those configurations/bundles which have
been actually checked
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1756774 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/sling/installer/hc/OsgiInstallerHealthCheck.java  | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/apache/sling/installer/hc/OsgiInstallerHealthCheck.java b/src/main/java/org/apache/sling/installer/hc/OsgiInstallerHealthCheck.java
index d718030..f1eaa95 100644
--- a/src/main/java/org/apache/sling/installer/hc/OsgiInstallerHealthCheck.java
+++ b/src/main/java/org/apache/sling/installer/hc/OsgiInstallerHealthCheck.java
@@ -155,15 +155,18 @@ public class OsgiInstallerHealthCheck implements HealthCheck {
         if (invalidResource != null) {
             if (resourceType.equals(InstallableResource.TYPE_CONFIG)) {
                 hcLog.critical(
-                        "The installer state of the OSGi configuration resource '{}' is {},
probably because a later version of that bundle is already installed!",
+                        "The installer state of the OSGi configuration resource '{}' is {},
config might have been manually overwritten!",
                         invalidResource, invalidResource.getState());
             } else {
                 hcLog.critical(
-                        "The installer state of the OSGi bundle resource '{}' is {}, config
might have been manually overwritten!",
+                        "The installer state of the OSGi bundle resource '{}' is {}, probably
because a later or the same version of that bundle is already installed!",
                         invalidResource, invalidResource.getState());
             }
+            return resourceType;
+        } else {
+            return ""; // do not count this group, as only non-considered resources have
been in there
         }
-        return resourceType;
+        
     }
 
 }

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

Mime
View raw message