[felix-dev] branch master updated: FELIX-6452 : Potential NPE in HttpRequestsCheck.activate

[cziegeler]

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

cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git


The following commit(s) were added to refs/heads/master by this push:
     new 1d53fa9  FELIX-6452 : Potential NPE in HttpRequestsCheck.activate
1d53fa9 is described below

commit 1d53fa9b2292d88c4a500f5bdb860e712cb6dce0
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Thu Aug 26 07:01:00 2021 +0200

    FELIX-6452 : Potential NPE in HttpRequestsCheck.activate
---
 .../felix/hc/generalchecks/HttpRequestsCheck.java  | 27 ++++++++++++----------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git 
a/healthcheck/generalchecks/src/main/java/org/apache/felix/hc/generalchecks/HttpRequestsCheck.java
 
b/healthcheck/generalchecks/src/main/java/org/apache/felix/hc/generalchecks/HttpRequestsCheck.java
index a8bf277..6239612 100644
--- 
a/healthcheck/generalchecks/src/main/java/org/apache/felix/hc/generalchecks/HttpRequestsCheck.java
+++ 
b/healthcheck/generalchecks/src/main/java/org/apache/felix/hc/generalchecks/HttpRequestsCheck.java
@@ -57,11 +57,12 @@ import org.apache.felix.hc.api.ResultLog;
 import org.apache.felix.hc.core.impl.util.lang.StringUtils;
 import org.apache.felix.hc.generalchecks.util.SimpleConstraintChecker;
 import org.apache.felix.utils.json.JSONParser;
-import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.ConfigurationPolicy;
+import org.osgi.service.component.annotations.Reference;
+import org.osgi.service.http.HttpService;
 import org.osgi.service.metatype.annotations.AttributeDefinition;
 import org.osgi.service.metatype.annotations.Designate;
 import org.osgi.service.metatype.annotations.ObjectClassDefinition;
@@ -128,32 +129,34 @@ public class HttpRequestsCheck implements HealthCheck {
     private Result.Status statusForFailedContraint;
     private boolean runInParallel;
 
-    private String defaultBaseUrl = null;
+    private String defaultBaseUrl;
 
     private FormattingResultLog configErrors;
 
+    @Reference
+    private ServiceReference<HttpService> httpServiceReference;
+
     @Activate
-    protected void activate(BundleContext bundleContext, Config config) {
+    protected void activate(Config config) {
         this.requestSpecs = getRequestSpecs(config.requests());
         this.connectTimeoutInMs = config.connectTimeoutInMs();
         this.readTimeoutInMs = config.readTimeoutInMs();
         this.statusForFailedContraint = config.statusForFailedContraint();
         this.runInParallel = config.runInParallel() && requestSpecs.size() > 1;
 
-        setupDefaultBaseUrl(bundleContext);
+        setupDefaultBaseUrl();
 
         LOG.debug("Default BaseURL: {}", defaultBaseUrl);
         LOG.debug("Activated Requests HC: {}", requestSpecs);
     }
 
-    private void setupDefaultBaseUrl(BundleContext bundleContext) {
-        ServiceReference<?> serviceReference = 
bundleContext.getServiceReference("org.osgi.service.http.HttpService");
-        boolean isHttp = 
Boolean.parseBoolean(String.valueOf(serviceReference.getProperty("org.apache.felix.http.enable")));
-        boolean isHttps = 
Boolean.parseBoolean(String.valueOf(serviceReference.getProperty("org.apache.felix.https.enable")));
-        if(isHttp) {
-            defaultBaseUrl = 
"http://localhost:"+serviceReference.getProperty("org.osgi.service.http.port");
-        } else if(isHttps) {
-            defaultBaseUrl = 
"http://localhost:"+serviceReference.getProperty("org.osgi.service.https.port");
+    private void setupDefaultBaseUrl() {
+        boolean isHttp = 
Boolean.parseBoolean(String.valueOf(httpServiceReference.getProperty("org.apache.felix.http.enable")));
+        boolean isHttps = 
Boolean.parseBoolean(String.valueOf(httpServiceReference.getProperty("org.apache.felix.https.enable")));
+        if (isHttp) {
+            defaultBaseUrl = 
"http://localhost:"+httpServiceReference.getProperty("org.osgi.service.http.port");
+        } else if (isHttps) {
+            defaultBaseUrl = 
"http://localhost:"+httpServiceReference.getProperty("org.osgi.service.https.port");
         }
     }