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
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 @@
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;
+
}
}
