Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=21157

Write cookie before response might be committed

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1056820 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4b05521..90c9213 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -295,6 +295,10 @@
   </subsection>
   <subsection name="Web applications">
     <changelog>
+      <fix>
+        <bug>21157</bug>: Ensure cookies are written before the response is
+        commited in the Cookie example. Patch provided by Stefan Radzom. (markt)
+      </fix>
       <add>
         <bug>50294</bug>: Add more information to documentation regarding format
         of configuration files. Patch provided by Luke Meyer. (markt) 

diff --git a/webapps/examples/WEB-INF/classes/CookieExample.java b/webapps/examples/WEB-INF/classes/CookieExample.java
index c49abea..00b5b89 100644 (file)
--- a/webapps/examples/WEB-INF/classes/CookieExample.java
+++ b/webapps/examples/WEB-INF/classes/CookieExample.java
@@ -47,6 +47,15 @@ public class CookieExample extends HttpServlet {
                       HttpServletResponse response)
         throws IOException, ServletException
     {
+        
+        String cookieName = request.getParameter("cookiename");
+        String cookieValue = request.getParameter("cookievalue");
+        Cookie aCookie = null;
+        if (cookieName != null && cookieValue != null) {
+            aCookie = new Cookie(cookieName, cookieValue);
+            response.addCookie(aCookie);
+        }
+
         response.setContentType("text/html");
 
         PrintWriter out = response.getWriter();
@@ -89,11 +98,7 @@ public class CookieExample extends HttpServlet {
             out.println(RB.getString("cookies.no-cookies"));
         }
 
-        String cookieName = request.getParameter("cookiename");
-        String cookieValue = request.getParameter("cookievalue");
-        if (cookieName != null && cookieValue != null) {
-            Cookie cookie = new Cookie(cookieName, cookieValue);
-            response.addCookie(cookie);
+        if (aCookie != null) {
             out.println("<P>");
             out.println(RB.getString("cookies.set") + "<br>");
             out.print(RB.getString("cookies.name") + "  "