You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@felix.apache.org by pa...@apache.org on 2018/12/03 17:53:34 UTC

svn commit: r1848078 - /felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/HttpServiceController.java

Author: pauls
Date: Mon Dec  3 17:53:34 2018
New Revision: 1848078

URL: http://svn.apache.org/viewvc?rev=1848078&view=rev
Log:
FELIX-5995: stop the whiteboardManager before the httpServiceFactory to avouid race conditions

Modified:
    felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/HttpServiceController.java

Modified: felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/HttpServiceController.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/HttpServiceController.java?rev=1848078&r1=1848077&r2=1848078&view=diff
==============================================================================
--- felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/HttpServiceController.java (original)
+++ felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/HttpServiceController.java Mon Dec  3 17:53:34 2018
@@ -131,8 +131,8 @@ public final class HttpServiceController
     {
         this.dispatcher.setWhiteboardManager(null);
 
-        this.httpServiceFactory.stop();
         this.whiteboardManager.stop();
+        this.httpServiceFactory.stop();
 
         this.registry.shutdown();
         this.httpSessionListener = null;