From 96785342cbd258a41fae0b4553a192399bb190d4 Mon Sep 17 00:00:00 2001
From: Karl Pauls <pauls@apache.org>
Date: Mon, 3 Dec 2018 17:53:34 +0000
Subject: [PATCH] FELIX-5995: stop the whiteboardManager before the
 httpServiceFactory to avouid race conditions

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1848078 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/felix/http/base/internal/HttpServiceController.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/http/base/src/main/java/org/apache/felix/http/base/internal/HttpServiceController.java b/http/base/src/main/java/org/apache/felix/http/base/internal/HttpServiceController.java
index db71d2b5f11..67610f90175 100644
--- a/http/base/src/main/java/org/apache/felix/http/base/internal/HttpServiceController.java
+++ b/http/base/src/main/java/org/apache/felix/http/base/internal/HttpServiceController.java
@@ -131,8 +131,8 @@ public void unregister()
     {
         this.dispatcher.setWhiteboardManager(null);
 
-        this.httpServiceFactory.stop();
         this.whiteboardManager.stop();
+        this.httpServiceFactory.stop();
 
         this.registry.shutdown();
         this.httpSessionListener = null;