[#1803] Add TCK tweaks to pax-web-jetty and pax-web-undertow

ops4j · Apr 6, 2023 · a016407 · a016407
1 parent 3eab74b
commit a016407
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/pax-web-jetty/src/main/java/org/ops4j/pax/web/service/jetty/internal/JettyServerWrapper.java b/pax-web-jetty/src/main/java/org/ops4j/pax/web/service/jetty/internal/JettyServerWrapper.java
@@ -1018,8 +1018,8 @@ public void visitOsgiContextModelChange(OsgiContextModelChange change) {
 					}
 				}
 
-				// and the highest ranked context should be registered as OSGi service (if it wasn't registered)
-				highestRankedContext.register();
+//				// and the highest ranked context should be registered as OSGi service (if it wasn't registered)
+//				highestRankedContext.register();
 			}
 
 			if (hasStopped) {
@@ -2425,6 +2425,10 @@ private void ensureServletContextStarted(PaxWebServletContextHandler sch) {
 			sch.start();
 
 			dynamicContext.rememberAttributesFromSCIs();
+
+			// only now, according to https://docs.osgi.org/specification/osgi.cmpn/7.0.0/service.war.html#d0e100694
+			// register the servlet context
+			highestRankedContext.register();
 		} catch (Exception e) {
 			LOG.error(e.getMessage(), e);
 		}

diff --git a/...rtow/src/main/java/org/ops4j/pax/web/service/undertow/internal/UndertowServerWrapper.java b/...rtow/src/main/java/org/ops4j/pax/web/service/undertow/internal/UndertowServerWrapper.java
@@ -1384,8 +1384,8 @@ public void visitOsgiContextModelChange(OsgiContextModelChange change) {
 					}
 				}
 
-				// and the highest ranked context should be registered as OSGi service (if it wasn't registered)
-				highestRankedContext.register();
+//				// and the highest ranked context should be registered as OSGi service (if it wasn't registered)
+//				highestRankedContext.register();
 			}
 			DeploymentInfo deploymentInfo = deploymentInfos.get(contextPath);
 			if (deploymentInfo != null) {
@@ -2908,6 +2908,10 @@ public String rewriteUrl(String originalUrl, String sessionId) {
 
 			// actual registration of "context" in Undertow's path handler.
 			pathHandler.addPrefixPath(contextPath, handler);
+
+			// only now, according to https://docs.osgi.org/specification/osgi.cmpn/7.0.0/service.war.html#d0e100694
+			// register the servlet context
+			highestRankedContext.register();
 		} catch (ServletException e) {
 			throw new IllegalStateException("Can't start Undertow context "
 					+ contextPath + ": " + e.getMessage(), e);