[PAXWEB-1173] Shutdown all XNIO workers created by pax-web-undertow -…

… when needed

(cherry picked from commit 6f2ab90)

pax-web-undertow/src/main/java/org/ops4j/pax/web/service/undertow/internal/Context.java

@@ -118,6 +118,8 @@ public class Context implements LifeCycle, HttpHandler, ResourceManager {
 
 	private ServiceTracker<PackageAdmin, PackageAdmin> packageAdminTracker;
 
+	private XnioWorker wsXnioWorker;
+
 	public Context(IdentityManager identityManager, ContextAwarePathHandler path, ContextModel contextModel) {
 		this.identityManager = identityManager;
 		this.path = path;
@@ -225,6 +227,10 @@ public synchronized void destroy() {
 		} catch (ServletException e) {
 			LOG.error(e.getMessage(), e);
 		}
+		if (wsXnioWorker != null) {
+			wsXnioWorker.shutdown();
+		}
+
 		// clean up.
 		// we really have to unregister all remaining ServletContext registrations, implicit Default Servlets
 		// and even normal servlets. For example CXF re-registers CXFServlet even when stopping
@@ -578,12 +584,12 @@ private void doCreateHandler(Consumer<ServletContext> consumer) throws ServletEx
 		}
 
 		if (isWebSocketAvailable()) {
-			XnioWorker xnioWorker = UndertowUtil.createWorker(contextModel.getClassLoader());
-			if (xnioWorker != null) {
+			wsXnioWorker = UndertowUtil.createWorker(contextModel.getClassLoader());
+			if (wsXnioWorker != null) {
 				deployment.addServletContextAttribute(
 						io.undertow.websockets.jsr.WebSocketDeploymentInfo.ATTRIBUTE_NAME,
 						new io.undertow.websockets.jsr.WebSocketDeploymentInfo()
-								.setWorker(xnioWorker)
+								.setWorker(wsXnioWorker)
 								.setBuffers(new DefaultByteBufferPool(true, 100))
 				);
 			}

pax-web-undertow/src/main/java/org/ops4j/pax/web/service/undertow/internal/ServerControllerImpl.java

@@ -141,6 +141,8 @@ private enum State {
     private Undertow server;
     private final ConcurrentMap<HttpContext, Context> contextMap = new ConcurrentHashMap<>();
 
+    private XnioWorker xnioWorker;
+
     public ServerControllerImpl(BundleContext context) {
         this.bundleContext = context;
     }
@@ -318,12 +320,12 @@ private HttpHandler configureUndertow(Configuration configuration, Undertow.Buil
 
             Bundle bundle = FrameworkUtil.getBundle(ServerControllerImpl.class);
             ClassLoader loader = bundle.adapt(BundleWiring.class).getClassLoader();
-            XnioWorker worker = UndertowUtil.createWorker(loader);
+            xnioWorker = UndertowUtil.createWorker(loader);
 
             // String logNameSuffix = logNCSAFormat.substring(logNCSAFormat.lastIndexOf("."));
             // String logBaseName = logNCSAFormat.substring(0, logNCSAFormat.lastIndexOf("."));
 
-            AccessLogReceiver logReceiver = DefaultAccessLogReceiver.builder().setLogWriteExecutor(worker)
+            AccessLogReceiver logReceiver = DefaultAccessLogReceiver.builder().setLogWriteExecutor(xnioWorker)
                     .setOutputDirectory(new File(logNCSADirectory).toPath()).setLogBaseName("request.")
                     .setLogNameSuffix("log").setRotate(true).build();
 
@@ -554,10 +556,10 @@ public String getProperty(String key, String defaultValue) {
 
                 Bundle bundle = FrameworkUtil.getBundle(ServerControllerImpl.class);
                 ClassLoader loader = bundle.adapt(BundleWiring.class).getClassLoader();
-                XnioWorker worker = UndertowUtil.createWorker(loader);
+                xnioWorker = UndertowUtil.createWorker(loader);
 
                 AccessLogReceiver logReceiver = DefaultAccessLogReceiver.builder()
-                        .setLogWriteExecutor(worker)
+                        .setLogWriteExecutor(xnioWorker)
                         .setOutputDirectory(new File(accessLog.getDirectory()).toPath())
                         .setLogBaseName(accessLog.getPrefix())
                         .setLogNameSuffix(accessLog.getSuffix())
@@ -837,6 +839,9 @@ private Object createConfigurationObject(Map<String, String> config, String name
     }
 
     void doStop() {
+        if (xnioWorker != null) {
+            xnioWorker.shutdown();
+        }
         server.stop();
     }