You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by hu...@apache.org on 2017/03/10 06:58:07 UTC
svn commit: r1786292 -
/tomcat/trunk/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java
Author: huxing
Date: Fri Mar 10 06:58:07 2017
New Revision: 1786292
URL: http://svn.apache.org/viewvc?rev=1786292&view=rev
Log:
Fix NPE for the server push example if HTTP/2 is not supported.
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java
Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java?rev=1786292&r1=1786291&r2=1786292&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java Fri Mar 10 06:58:07 2017
@@ -33,18 +33,27 @@ public class SimpleImagePush extends Htt
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
- PushBuilder pb = req.getPushBuilder().path("servlets/images/code.gif");
- pb.push();
-
resp.setCharacterEncoding("UTF-8");
resp.setContentType("text/html");
PrintWriter pw = resp.getWriter();
- pw.println("<html>");
- pw.println("<body>");
- pw.println("<p>The following image was provided via a push request.</p>");
- pw.println("<img src=\"" + req.getContextPath() + "/servlets/images/code.gif\"/>");
- pw.println("</body>");
- pw.println("</html>");
- pw.flush();
+
+ PushBuilder pb = req.getPushBuilder();
+ if (pb != null) {
+ pb.path("servlets/images/code.gif");
+ pb.push();
+ pw.println("<html>");
+ pw.println("<body>");
+ pw.println("<p>The following image was provided via a push request.</p>");
+ pw.println("<img src=\"" + req.getContextPath() + "/servlets/images/code.gif\"/>");
+ pw.println("</body>");
+ pw.println("</html>");
+ pw.flush();
+ } else {
+ pw.println("<html>");
+ pw.println("<body>");
+ pw.println("<p>Server push requests are not supported by this protocol.</p>");
+ pw.println("</body>");
+ pw.println("</html>");
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org