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

[Gavin King]

  User: gavin   
  Date: 07/02/10 04:02:40

  Modified:    src/main/org/jboss/seam/web  CharacterEncodingFilter.java
  Log:
  fix npe
  
  Revision  Changes    Path
  1.3       +1 -1      jboss-seam/src/main/org/jboss/seam/web/CharacterEncodingFilter.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CharacterEncodingFilter.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/web/CharacterEncodingFilter.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- CharacterEncodingFilter.java	10 Feb 2007 08:36:35 -0000	1.2
  +++ CharacterEncodingFilter.java	10 Feb 2007 09:02:40 -0000	1.3
  @@ -36,7 +36,7 @@
      public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain)
            throws ServletException, IOException
      {
  -      if ( overrideClient || request.getCharacterEncoding() == null )
  +      if ( encoding!=null && ( overrideClient || request.getCharacterEncoding() == null ) )
         {
            request.setCharacterEncoding(encoding);
         }