[jboss-cvs] jboss-seam/src/ui/org/jboss/seam/ui ...

[Shane Bryzak]

  User: sbryzak2
  Date: 07/05/31 21:24:25

  Modified:    src/ui/org/jboss/seam/ui  UIFileUpload.java
  Log:
  better exceptions for file upload
  
  Revision  Changes    Path
  1.8       +39 -26    jboss-seam/src/ui/org/jboss/seam/ui/UIFileUpload.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: UIFileUpload.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/ui/org/jboss/seam/ui/UIFileUpload.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- UIFileUpload.java	13 May 2007 08:33:36 -0000	1.7
  +++ UIFileUpload.java	1 Jun 2007 01:24:25 -0000	1.8
  @@ -49,11 +49,19 @@
            
            this.request.getFileName(clientId);   
         }      
  +      
  +      if (request == null)
  +      {
  +         throw new IllegalStateException("Request is not an instance of MultipartRequest, " +
  +                  "or does not wrap it.  Please ensure that SeamFilter is installed in web.xml");
  +      }
      }
      
      @Override
      public void processUpdates(FacesContext context)
      {                         
  +      if (request != null)
  +      {
         String clientId = getClientId(context);
         String contentType = request.getFileContentType(clientId);
         String fileName = request.getFileName(clientId);
  @@ -85,7 +93,12 @@
         if (vb != null)
            vb.setValue(context.getELContext(), fileSize);            
      }   
  +   }   
         
  +   /**
  +    * Finds an instance of MultipartRequest wrapped within a request or its
  +    * (recursively) wrapped requests. 
  +    */
      private ServletRequest unwrapMultipartRequest(ServletRequest request)
      {      
         while (!(request instanceof MultipartRequest))