You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wink.apache.org by ng...@apache.org on 2010/07/30 18:46:46 UTC

svn commit: r980884 - /incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/AdminServlet.java

Author: ngallardo
Date: Fri Jul 30 16:46:46 2010
New Revision: 980884

URL: http://svn.apache.org/viewvc?rev=980884&view=rev
Log:
WINK-303   Set the response code first or the AdminServlet content will not be returned in some servlet containers.

Modified:
    incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/AdminServlet.java

Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/AdminServlet.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/AdminServlet.java?rev=980884&r1=980883&r2=980884&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/AdminServlet.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/AdminServlet.java Fri Jul 30 16:46:46 2010
@@ -436,6 +436,10 @@ public class AdminServlet extends Abstra
      * @throws IOException
      */
     private void buildAdminHome(HttpServletResponse response) throws IOException {
+        // Set the response code before writing the content
+        // per the servlet specification.
+        response.setStatus(HttpStatus.BAD_REQUEST.getCode());
+        
         PrintWriter writer = response.getWriter();
         writer
             .write("<html>\r\n" + "<head>\r\n" //$NON-NLS-1$ //$NON-NLS-2$
@@ -462,7 +466,6 @@ public class AdminServlet extends Abstra
                 + "</form>\r\n" //$NON-NLS-1$
                 + "</body>\r\n" //$NON-NLS-1$
                 + "</html>"); //$NON-NLS-1$
-        response.setStatus(HttpStatus.BAD_REQUEST.getCode());
         writer.close();
         return;
     }