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

[Gavin King]

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

  Modified:    src/main/org/jboss/seam/captcha   Captcha.java
                        CaptchaImage.java
  Log:
  fix broken captcha functionality
  fix NPEs in conversation management from ResourceServlet
  
  Revision  Changes    Path
  1.5       +1 -1      jboss-seam/src/main/org/jboss/seam/captcha/Captcha.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Captcha.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/captcha/Captcha.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- Captcha.java	14 Feb 2007 07:48:06 -0000	1.4
  +++ Captcha.java	8 Mar 2007 17:16:16 -0000	1.5
  @@ -31,7 +31,7 @@
         id =  new UID().toString().replace(":", "-");
      }
      
  -   boolean validateResponse(String response)
  +   public boolean validateResponse(String response)
      {
         boolean valid = CaptchaImage.instance().validateResponse(id, response);
         if (!valid) 
  
  
  
  1.6       +0 -7      jboss-seam/src/main/org/jboss/seam/captcha/CaptchaImage.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CaptchaImage.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/captcha/CaptchaImage.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- CaptchaImage.java	21 Feb 2007 20:37:26 -0000	1.5
  +++ CaptchaImage.java	8 Mar 2007 17:16:16 -0000	1.6
  @@ -19,7 +19,6 @@
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.annotations.Startup;
   import org.jboss.seam.contexts.Contexts;
  -import org.jboss.seam.contexts.Lifecycle;
   import org.jboss.seam.servlet.AbstractResource;
   
   import com.octo.captcha.service.CaptchaServiceException;
  @@ -82,8 +81,6 @@
   
         try
         {
  -         Lifecycle.beginRequest( getServletContext(), request.getSession(), request );
  -
            String captchaId = request.getQueryString();
   
            BufferedImage challenge = service.getImageChallengeForID( captchaId, request.getLocale() );
  @@ -100,10 +97,6 @@
            response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
            return;
         }
  -      finally
  -      {
  -         Lifecycle.endRequest();
  -      }
   
         response.setHeader("Cache-Control", "no-store");
         response.setHeader("Pragma", "no-cache");