Author: markt
Date: Wed Jul 10 11:46:04 2013
New Revision: 1501732
URL: http://svn.apache.org/r1501732
Log:
Whoops. Fix JSPs for apps that don't have a JSP config descriptor element in
their web.xml.
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java
tomcat/trunk/webapps/docs/web-socket-howto.xml
Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java?rev=1501732&r1=1501731&r2=1501732&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java Wed Jul 10
11:46:04 2013
@@ -79,6 +79,10 @@ public class JspConfig {
JspConfigDescriptor jspConfig = ctxt.getJspConfigDescriptor();
+ if (jspConfig == null) {
+ return;
+ }
+
Collection<JspPropertyGroupDescriptor> jspPropertyGroups =
jspConfig.getJspPropertyGroups();
Modified: tomcat/trunk/webapps/docs/web-socket-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/web-socket-howto.xml?rev=1501732&r1=1501731&r2=1501732&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/web-socket-howto.xml (original)
+++ tomcat/trunk/webapps/docs/web-socket-howto.xml Wed Jul 10 11:46:04 2013
@@ -40,7 +40,7 @@
<section name="Application development">
<p>Tomcat implements the Java WebSocket 1.0 API defined by <a
href="http://www.jcp.org/en/jsr/detail?id=356";>JSR-356</a>.</p>
-
+
<p>There are several example applications that demonstrate how the WebSocket
API
can be used. You will need to look at both the client side <a
href="http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/websocket/";>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
