Author: markt
Date: Tue Jan 29 19:46:34 2013
New Revision: 1440082
URL: http://svn.apache.org/viewvc?rev=1440082&view=rev
Log:
Make sure buffer sizes are picked up from the servlet context initialisation
parameters
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/ServerContainerImpl.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/ServerContainerImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/ServerContainerImpl.java?rev=1440082&r1=1440081&r2=1440082&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/websocket/server/ServerContainerImpl.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/server/ServerContainerImpl.java
Tue Jan 29 19:46:34 2013
@@ -38,7 +38,7 @@ import org.apache.tomcat.websocket.pojo.
/**
* Provides a per class loader (i.e. per web application) instance of a
* ServerContainer. Web application wide defaults may be configured by setting
- * the following sevrlet context initialisation parameters to the desired
+ * the following servlet context initialisation parameters to the desired
* values.
* <ul>
* <li>{@link Constants#BINARY_BUFFER_SIZE_SERVLET_CONTEXT_INIT_PARAM}</li>
@@ -160,7 +160,7 @@ public class ServerContainerImpl extends
}
// Set the ServletContext if it hasn't already been set
if (servletContext == null) {
- servletContext = ctxt;
+ setServletContext(ctxt);
} else if (ctxt != servletContext) {
// Should never happen
throw new IllegalStateException(sm.getString(
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
