Merge pull request #481 from francescomari/fix/whiteboard-manager-shutdown-npe

Fix unrecoverable Jetty state after NPE in WhiteboardManager shutdown

Author: paulrutter

http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/WhiteboardManager.java

@@ -199,7 +199,14 @@ public void stop()
         this.serviceRuntime.unregister();
         for(final ServiceTracker<?, ?> t : this.trackers)
         {
-            t.close();
+            try
+            {
+                t.close();
+            }
+            catch (final Exception e)
+            {
+                SystemLogger.LOGGER.error("Exception while closing service tracker", e);
+            }
         }
         this.trackers.clear();
         this.preprocessorHandlers = Collections.emptyList();
@@ -328,7 +335,10 @@ private void deactivate(final WhiteboardContextHandler handler)
             }
         }
         // context listeners last
-        handler.getRegistry().getEventListenerRegistry().contextDestroyed();
+        if ( handler.getRegistry() != null )
+        {
+            handler.getRegistry().getEventListenerRegistry().contextDestroyed();
+        }
         for(final WhiteboardServiceInfo<?> info : listeners)
         {
             this.unregisterWhiteboardService(handler, info);
@@ -480,6 +490,10 @@ else if ( activateNext )
                                 this.failureStateHandler.addFailure(newHead.getContextInfo(), DTOConstants.FAILURE_REASON_SERVICE_NOT_GETTABLE);
                             }
                         }
+                        if ( handlerList.isEmpty() )
+                        {
+                            this.contextMap.remove(info.getName());
+                        }
                     }
                 }
             }
@@ -494,6 +508,10 @@ else if ( activateNext )
     private List<WhiteboardContextHandler> getMatchingContexts(final WhiteboardServiceInfo<?> info) {
         final List<WhiteboardContextHandler> result = new ArrayList<>();
         for(final List<WhiteboardContextHandler> handlerList : this.contextMap.values()) {
+            if ( handlerList.isEmpty() )
+            {
+                continue;
+            }
             final WhiteboardContextHandler h = handlerList.get(0);
 
             // check if the context matches
@@ -881,6 +899,10 @@ private WhiteboardContextHandler getContextHandler(final String name)
         {
             for(final List<WhiteboardContextHandler> handlerList : this.contextMap.values())
             {
+                if ( handlerList.isEmpty() )
+                {
+                    continue;
+                }
                 final WhiteboardContextHandler h = handlerList.get(0);
                 if ( h.getContextInfo().getName().equals(name) )
                 {

http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java

@@ -215,7 +215,14 @@ private void stopJetty()
         if (this.server != null)
         {
             this.controller.getEventDispatcher().setActive(false);
-            this.controller.unregister();
+            try
+            {
+                this.controller.unregister();
+            }
+            catch (final Exception e)
+            {
+                SystemLogger.LOGGER.error("Exception during controller unregister", e);
+            }
 
             if (this.fileRequestLog != null)
             {

http/jetty12/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java

@@ -225,7 +225,14 @@ private void stopJetty()
         if (this.server != null)
         {
             this.controller.getEventDispatcher().setActive(false);
-            this.controller.unregister();
+            try
+            {
+                this.controller.unregister();
+            }
+            catch (final Exception e)
+            {
+                SystemLogger.LOGGER.error("Exception during controller unregister", e);
+            }
 
             if (this.fileRequestLog != null)
             {