[karaf] branch master updated: add NPE guard for proxyService

[ff...@apache.org]

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

ffang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/master by this push:
     new ab4c9e8  add NPE guard for proxyService
ab4c9e8 is described below

commit ab4c9e857c5b5a0938622efc6a457b145644bfe8
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Thu Nov 15 10:02:58 2018 +0800

    add NPE guard for proxyService
---
 .../main/java/org/apache/karaf/http/core/internal/osgi/Activator.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/http/src/main/java/org/apache/karaf/http/core/internal/osgi/Activator.java b/http/src/main/java/org/apache/karaf/http/core/internal/osgi/Activator.java
index 05eb9c2..6be368b 100644
--- a/http/src/main/java/org/apache/karaf/http/core/internal/osgi/Activator.java
+++ b/http/src/main/java/org/apache/karaf/http/core/internal/osgi/Activator.java
@@ -98,6 +98,8 @@ public class Activator extends BaseActivator implements ManagedService {
 
     @Override
     public void updated(Dictionary<String, ?> properties) {
-        proxyService.initProxies();
+        if (proxyService != null) {
+            proxyService.initProxies();
+        }
     }
 }