svn commit: r1684172 - in /tomcat/trunk/java/org/apache/tomcat/websocket/server: UpgradeUtil.java WsServerContainer.java

[violetagg]

Author: violetagg
Date: Mon Jun  8 12:43:30 2015
New Revision: 1684172

URL: http://svn.apache.org/r1684172
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57969
Provide path params to POJO via WsPerSessionServerEndpointConfig instead of the 
'global' ServerEndpointConfig.

Modified:
    tomcat/trunk/java/org/apache/tomcat/websocket/server/UpgradeUtil.java
    tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java

Modified: tomcat/trunk/java/org/apache/tomcat/websocket/server/UpgradeUtil.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/UpgradeUtil.java?rev=1684172&r1=1684171&r2=1684172&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/server/UpgradeUtil.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/server/UpgradeUtil.java Mon 
Jun  8 12:43:30 2015
@@ -223,6 +223,9 @@ public class UpgradeUtil {
                         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);

Modified: 
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java?rev=1684172&r1=1684171&r2=1684172&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java 
Mon Jun  8 12:43:30 2015
@@ -380,13 +380,6 @@ public class WsServerContainer extends W
             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);
     }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org