LDEV-5385 - read the correct attribute

Author: michaeloffner

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.lucee</groupId>
     <artifactId>websocket-extension</artifactId>
-    <version>1.0.0.11-SNAPSHOT</version>
+    <version>1.0.0.13-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Websocket Extension</name>
 

source/java/src/org/lucee/extension/websocket/WebSocketEndpointFactory.java

@@ -144,7 +144,8 @@ else if (WSUtil.getContainerType(cw) == WSUtil.TYPE_JAVAX)
 						WSUtil.info(cw, msg);
 						try {
 
-							Object oServerContainer = cw.getServletContext().getAttribute("javax.websocket.server.ServerContainer");
+							Object oServerContainer = cw.getServletContext()
+									.getAttribute((WSUtil.getContainerType(cw) == WSUtil.TYPE_JAKARTA ? "jakarta" : "javax") + ".websocket.server.ServerContainer");
 
 							if (WSUtil.getContainerType(cw) == WSUtil.TYPE_JAKARTA) {
 								props.put("lucee.websocket.endpoint", JAKARTA_ENDPOINT_CLASS);

source/java/src/org/lucee/extension/websocket/util/aprint.java

@@ -10,8 +10,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.servlet.http.Cookie;
-
 import org.w3c.dom.Attr;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
@@ -212,11 +210,6 @@ private static void _eo(PrintStream ps, Object o) {
 		else if (o instanceof NamedNodeMap) _eo(ps, (NamedNodeMap) o);
 		else if (o instanceof Node) _eo(ps, (Node) o);
 		else if (o instanceof Throwable) _eo(ps, (Throwable) o);
-		else if (o instanceof Cookie) {
-			Cookie c = (Cookie) o;
-			ps.println("Cookie(name:" + c.getName() + ";domain:" + c.getDomain() + ";maxage:" + c.getMaxAge() + ";path:" + c.getPath() + ";value:" + c.getValue() + ";version:"
-					+ c.getVersion() + ";secure:" + c.getSecure() + ")");
-		}
 
 		else ps.println(o);
 	}