svn commit: r1761753 - /sling/trunk/bundles/extensions/discovery/oak/src/main/java/org/apache/sling/discovery/oak/pinger/OakViewChecker.java

[st...@apache.org]

Author: stefanegli
Date: Wed Sep 21 14:32:41 2016
New Revision: 1761753

URL: http://svn.apache.org/viewvc?rev=1761753&view=rev
Log:
SLING-6065 : removed unnecessary log.error which is actually a legitimate case at startup

Modified:
    sling/trunk/bundles/extensions/discovery/oak/src/main/java/org/apache/sling/discovery/oak/pinger/OakViewChecker.java

Modified: sling/trunk/bundles/extensions/discovery/oak/src/main/java/org/apache/sling/discovery/oak/pinger/OakViewChecker.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/oak/src/main/java/org/apache/sling/discovery/oak/pinger/OakViewChecker.java?rev=1761753&r1=1761752&r2=1761753&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/discovery/oak/src/main/java/org/apache/sling/discovery/oak/pinger/OakViewChecker.java (original)
+++ sling/trunk/bundles/extensions/discovery/oak/src/main/java/org/apache/sling/discovery/oak/pinger/OakViewChecker.java Wed Sep 21 14:32:41 2016
@@ -313,7 +313,12 @@ public class OakViewChecker extends Base
 
     protected void updateProperties() {
         if (discoveryService == null) {
-            logger.error("issueHeartbeat: discoveryService is null");
+            // SLING-6065: it's legitimate that updateProperties()
+            // (which comes from BaseViewChecker.issueHeartbeat())
+            // is called while discoveryService is not yet set. That's 
+            // due to the fact that discoveryService is set in initialize()
+            // which is called once the OakDiscoveryService is activated
+            // and that can come at a later point.
         } else {
             discoveryService.updateProperties();
         }