This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
The following commit(s) were added to refs/heads/master by this push:
new 69bb629081 Fix import (#313)
69bb629081 is described below
commit 69bb629081c8fc0cc3691ab24e70ed5261a4bb1a
Author: Paul <[email protected]>
AuthorDate: Wed May 1 10:49:45 2024 +0200
Fix import (#313)
---
.../main/java/org/apache/felix/http/jetty/internal/JettyService.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git
a/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java
b/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java
index d9e4c3768a..6d56a55a9e 100644
---
a/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java
+++
b/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java
@@ -53,7 +53,6 @@ import org.eclipse.jetty.servlet.ServletHolder;
import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.eclipse.jetty.util.thread.QueuedThreadPool;
import org.eclipse.jetty.util.thread.ThreadPool;
-import org.eclipse.jetty.websocket.server.JettyWebSocketServerContainer;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
@@ -532,7 +531,7 @@ public final class JettyService
// set it on the shared servlet context once available
if (this.config.isUseJettyEE9Websocket() &&
isClassNameVisible("org.eclipse.jetty.websocket.server.config.JettyWebSocketServletContainerInitializer"))
{
- String attribute =
JettyWebSocketServerContainer.JETTY_WEBSOCKET_CONTAINER_ATTRIBUTE;
+ String attribute =
org.eclipse.jetty.websocket.server.JettyWebSocketServerContainer.JETTY_WEBSOCKET_CONTAINER_ATTRIBUTE;
this.controller.setAttributeSharedServletContext(attribute,
context.getServletContext().getAttribute(attribute));
}
if (this.config.isUseJakartaEE9Websocket() &&