/*
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
 * this work for additional information regarding copyright ownership.
 * The ASF licenses this file to You under the Apache License, Version 2.0
 * (the "License"); you may not use this file except in compliance with
 * the License.  You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package org.apache.karaf.http.core.internal.osgi;

import org.apache.karaf.http.core.ProxyService;
import org.apache.karaf.http.core.ServletService;
import org.apache.karaf.http.core.internal.HttpMBeanImpl;
import org.apache.karaf.http.core.internal.ProxyServiceImpl;
import org.apache.karaf.http.core.internal.ServletEventHandler;
import org.apache.karaf.http.core.internal.ServletServiceImpl;
import org.apache.karaf.util.tracker.BaseActivator;
import org.apache.karaf.util.tracker.annotation.Managed;
import org.apache.karaf.util.tracker.annotation.ProvideService;
import org.apache.karaf.util.tracker.annotation.RequireService;
import org.apache.karaf.util.tracker.annotation.Services;
import org.ops4j.pax.web.service.spi.ServletListener;
import org.osgi.framework.BundleEvent;
import org.osgi.framework.BundleListener;
import org.osgi.service.cm.ConfigurationAdmin;
import org.osgi.service.cm.ManagedService;
import org.osgi.service.http.HttpService;

import java.util.Dictionary;

@Services(
        requires = {
                @RequireService(HttpService.class),
                @RequireService(ConfigurationAdmin.class)
        },
        provides = {
                @ProvideService(ServletService.class),
                @ProvideService(ProxyService.class)
        }
)
@Managed("org.apache.karaf.http")
public class Activator extends BaseActivator implements ManagedService {

    private BundleListener listener;

    private ProxyService proxyService;

    @Override
    protected void doStart() throws Exception {
        HttpService httpService = getTrackedService(HttpService.class);
        if (httpService == null) {
            return;
        }

        ConfigurationAdmin configurationAdmin = getTrackedService(ConfigurationAdmin.class);
        if (configurationAdmin == null) {
            return;
        }

        final ServletEventHandler servletEventHandler = new ServletEventHandler();
        register(ServletListener.class, servletEventHandler);

        ServletServiceImpl servletService = new ServletServiceImpl(servletEventHandler);
        register(ServletService.class, servletService);

        listener = event -> {
            if (event.getType() == BundleEvent.UNINSTALLED
                    || event.getType() == BundleEvent.UNRESOLVED
                    || event.getType() == BundleEvent.STOPPED) {
                servletEventHandler.removeEventsForBundle(event.getBundle());
            }
        };
        bundleContext.addBundleListener(listener);

        proxyService = new ProxyServiceImpl(httpService, configurationAdmin);
        register(ProxyService.class, proxyService);

        HttpMBeanImpl httpMBean = new HttpMBeanImpl(servletService, proxyService);
        registerMBean(httpMBean, "type=http");
    }

    @Override
    protected void doStop() {
        if (listener != null) {
            bundleContext.removeBundleListener(listener);
            listener = null;
        }
        super.doStop();
    }

    @Override
    public void updated(Dictionary<String, ?> properties) {
        proxyService.initProxies();
    }
}

@@ -3837,24 +3837,64 @@
 operties) %7B%0A
+        if (proxyService != null) %7B%0A    
         prox
@@ -3913,20 +3913,30 @@
 tProxies();%0A
+        %7D%0A
     %7D%0A%7D%0A

add NPE guard for proxyService