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

[ol...@apache.org]

Author: olli
Date: Thu Apr 28 20:20:23 2016
New Revision: 1741508

URL: http://svn.apache.org/viewvc?rev=1741508&view=rev
Log:
SLING-5697 Missing null check in OakViewChecker for slingHomePath

add null-check for slingSettingsService.getSlingHomePath()

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=1741508&r1=1741507&r2=1741508&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 Thu Apr 28 20:20:23 2016
@@ -257,7 +257,10 @@ public class OakViewChecker extends Base
 
             resourceMap.put(PROPERTY_ID_RUNTIME, runtimeId);
             // SLING-4765 : store more infos to be able to be more verbose on duplicate slingId/ghost detection
-            final String slingHomePath = slingSettingsService==null ? "n/a" : slingSettingsService.getSlingHomePath();
+            String slingHomePath = "n/a";
+            if (slingSettingsService != null && slingSettingsService.getSlingHomePath() != null) {
+                slingHomePath = slingSettingsService.getSlingHomePath();
+            }
             resourceMap.put(PROPERTY_ID_SLING_HOME_PATH, slingHomePath);
             final String endpointsAsString = getEndpointsAsString();
             resourceMap.put(PROPERTY_ID_ENDPOINTS, endpointsAsString);