[jboss-cvs] jboss-seam/src/main/org/jboss/seam/servlet ...

[Gavin King]

  User: gavin   
  Date: 07/03/08 12:16:17

  Modified:    src/main/org/jboss/seam/servlet  ResourceServlet.java
  Log:
  fix broken captcha functionality
  fix NPEs in conversation management from ResourceServlet
  
  Revision  Changes    Path
  1.5       +7 -10     jboss-seam/src/main/org/jboss/seam/servlet/ResourceServlet.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ResourceServlet.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/servlet/ResourceServlet.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- ResourceServlet.java	4 Mar 2007 21:51:51 -0000	1.4
  +++ ResourceServlet.java	8 Mar 2007 17:16:17 -0000	1.5
  @@ -4,9 +4,6 @@
   import java.util.HashMap;
   import java.util.Map;
   
  -import javax.faces.FactoryFinder;
  -import javax.faces.context.FacesContext;
  -import javax.faces.context.FacesContextFactory;
   import javax.faces.event.PhaseId;
   import javax.servlet.ServletConfig;
   import javax.servlet.ServletContext;
  @@ -62,13 +59,6 @@
      public void doGet(HttpServletRequest request, HttpServletResponse response)
               throws ServletException, IOException
      {
  -      doPost(request, response);
  -   }
  -
  -   @Override
  -   public void doPost(HttpServletRequest request, HttpServletResponse response)
  -            throws ServletException, IOException
  -   {
         String prefix = request.getContextPath() + request.getServletPath();
   
         if (request.getRequestURI().startsWith(prefix))
  @@ -109,4 +99,11 @@
   
         }
      }
  +
  +   @Override
  +   public void doPost(HttpServletRequest request, HttpServletResponse response)
  +            throws ServletException, IOException
  +   {
  +      throw new UnsupportedOperationException("Cannot post to the resource servlet");
  +   }
   }