Attachment #32794 for bug #57969

View | Details | Raw Unified | Return to bug 57969
Collapse All | Expand All

Lines 223-228 Link Here

(-)java/org/apache/tomcat/websocket/server/UpgradeUtil.java (+3 lines)
223	clazz);	223	clazz);
224	} else {	224	} else {
225	ep = new PojoEndpointServer();	225	ep = new PojoEndpointServer();
		226	// Need to make path params available to POJO
		227	perSessionServerEndpointConfig.getUserProperties().put(
		228	org.apache.tomcat.websocket.pojo.Constants.POJO_PATH_PARAM_KEY, pathParams);
226	}	229	}
227	} catch (InstantiationException e) {	230	} catch (InstantiationException e) {
228	throw new ServletException(e);	231	throw new ServletException(e);




            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);
    }


Return to bug 57969

Lines 380-392 Link Here

(-)java/org/apache/tomcat/websocket/server/WsServerContainer.java (-7 lines)
380	return null;	380	return null;
381	}	381	}
382		382
383	if (!PojoEndpointServer.class.isAssignableFrom(sec.getEndpointClass())) {
384	// Need to make path params available to POJO
385	sec.getUserProperties().put(
386	org.apache.tomcat.websocket.pojo.Constants.POJO_PATH_PARAM_KEY,
387	pathParams);
388	}
389
390	return new WsMappingResult(sec, pathParams);	383	return new WsMappingResult(sec, pathParams);
391	}	384	}
392		385