Author: kwin
Date: Thu Aug 18 13:02:46 2016
New Revision: 1756774
URL: http://svn.apache.org/viewvc?rev=1756774&view=rev
Log:
SLING-5888 fix emitted warnings and only count those configurations/bundles which have been actually checked
Modified:
sling/trunk/installer/hc/src/main/java/org/apache/sling/installer/hc/OsgiInstallerHealthCheck.java
Modified: sling/trunk/installer/hc/src/main/java/org/apache/sling/installer/hc/OsgiInstallerHealthCheck.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/hc/src/main/java/org/apache/sling/installer/hc/OsgiInstallerHealthCheck.java?rev=1756774&r1=1756773&r2=1756774&view=diff
==============================================================================
--- sling/trunk/installer/hc/src/main/java/org/apache/sling/installer/hc/OsgiInstallerHealthCheck.java (original)
+++ sling/trunk/installer/hc/src/main/java/org/apache/sling/installer/hc/OsgiInstallerHealthCheck.java Thu Aug 18 13:02:46 2016
@@ -155,15 +155,18 @@ public class OsgiInstallerHealthCheck im
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;
+
}
}