[sling-org-apache-sling-discovery-oak] 24/32: SLING-5697 Missing null check in OakViewChecker for slingHomePath

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.discovery.oak-1.2.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-oak.git

commit 10aec7962dddbb0debc3923af658193617f1756f
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu Apr 28 20:20:23 2016 +0000

    SLING-5697 Missing null check in OakViewChecker for slingHomePath
    
    add null-check for slingSettingsService.getSlingHomePath()
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak@1741508 13f79535-47bb-0310-9956-ffa450edef68
---
 .../java/org/apache/sling/discovery/oak/pinger/OakViewChecker.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/sling/discovery/oak/pinger/OakViewChecker.java b/src/main/java/org/apache/sling/discovery/oak/pinger/OakViewChecker.java
index 3ba00bd..4dd9e22 100644
--- a/src/main/java/org/apache/sling/discovery/oak/pinger/OakViewChecker.java
+++ b/src/main/java/org/apache/sling/discovery/oak/pinger/OakViewChecker.java
@@ -257,7 +257,10 @@ public class OakViewChecker extends BaseViewChecker {
 
             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);

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