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

[Shane Bryzak]

  User: sbryzak2
  Date: 07/02/05 16:49:04

  Modified:    src/main/org/jboss/seam/servlet  MultipartRequest.java
  Log:
  fixed typo
  
  Revision  Changes    Path
  1.5       +6 -3      jboss-seam/src/main/org/jboss/seam/servlet/MultipartRequest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: MultipartRequest.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/servlet/MultipartRequest.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- MultipartRequest.java	4 Feb 2007 08:11:34 -0000	1.4
  +++ MultipartRequest.java	5 Feb 2007 21:49:04 -0000	1.5
  @@ -39,6 +39,7 @@
      private static final int CHUNK_SIZE = 512;
      
      private boolean createTempFiles = false;
  +   private String encoding = null;
      
      private Map<String,Param> parameters = null;
      
  @@ -85,8 +86,10 @@
         }
         
         public void complete()
  +         throws UnsupportedEncodingException
         {
  -         String val = new String(buf.toByteArray());
  +         String val = encoding == null ? new String(buf.toByteArray()) :
  +                                         new String(buf.toByteArray(), encoding);
            if (value == null)
            {
               value = val;
  @@ -242,7 +245,7 @@
                     + "no multipart boundary was found");
         }
         
  -//      String charEncoding = request.getCharacterEncoding();    
  +      encoding = request.getCharacterEncoding();    
         
         parameters = new HashMap<String,Param>();      
         
  @@ -482,7 +485,7 @@
      {
         Param p = getParam(name);    
         return (p != null && p instanceof FileParam) ? 
  -               ((FileParam) p).getContentType() : null;
  +               ((FileParam) p).getFilename() : null;
      }   
      
      @Override