Attachment 32794 Details for Bug 57969 – Patch proposal

[patch] Patch proposal

bug57969.patch (text/plain), 1.47 KB, created by Violeta Georgieva on 2015-06-04 14:34:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Violeta Georgieva

Created: 2015-06-04 14:34:37 UTC

Size: 1.47 KB

patch

obsolete

>Index: java/org/apache/tomcat/websocket/server/UpgradeUtil.java
>===================================================================
>--- java/org/apache/tomcat/websocket/server/UpgradeUtil.java	(revision 1683554)
>+++ java/org/apache/tomcat/websocket/server/UpgradeUtil.java	(working copy)
>@@ -223,6 +223,9 @@
>                         clazz);
>             } else {
>                 ep = new PojoEndpointServer();
>+                // Need to make path params available to POJO
>+                perSessionServerEndpointConfig.getUserProperties().put(
>+                        org.apache.tomcat.websocket.pojo.Constants.POJO_PATH_PARAM_KEY, pathParams);
>             }
>         } catch (InstantiationException e) {
>             throw new ServletException(e);
>Index: java/org/apache/tomcat/websocket/server/WsServerContainer.java
>===================================================================
>--- java/org/apache/tomcat/websocket/server/WsServerContainer.java	(revision 1683554)
>+++ java/org/apache/tomcat/websocket/server/WsServerContainer.java	(working copy)
>@@ -380,13 +380,6 @@
>             return null;
>         }
> 
>-        if (!PojoEndpointServer.class.isAssignableFrom(sec.getEndpointClass())) {
>-            // Need to make path params available to POJO
>-            sec.getUserProperties().put(
>-                    org.apache.tomcat.websocket.pojo.Constants.POJO_PATH_PARAM_KEY,
>-                    pathParams);
>-        }
>-
>         return new WsMappingResult(sec, pathParams);
>     }
>

Actions: View | Diff

Attachments on bug 57969: 32794