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

[Gavin King]

  User: gavin   
  Date: 07/02/21 11:33:31

  Modified:    src/ui/org/jboss/seam/ui  FileUpload.java
  Log:
  fix npe
  
  Revision  Changes    Path
  1.11      +11 -2     jboss-seam/src/ui/org/jboss/seam/ui/FileUpload.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: FileUpload.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/ui/org/jboss/seam/ui/FileUpload.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- FileUpload.java	19 Feb 2007 03:36:19 -0000	1.10
  +++ FileUpload.java	21 Feb 2007 16:33:31 -0000	1.11
  @@ -53,7 +53,8 @@
              f.setAccessible(true);
              request = f.get(request);
            }
  -         catch (Exception ex) { 
  +         catch (Exception ex) 
  +         { 
               // too bad            
            }
            finally
  @@ -76,10 +77,14 @@
            {
               Class cls = dataBinding.getType(context);
               if (cls.isAssignableFrom(InputStream.class))
  +            {
                  dataBinding.setValue(context, req.getFileInputStream(clientId));
  +            }
               else if (cls.isAssignableFrom(byte[].class))
  +            {
                  dataBinding.setValue(context, req.getFileBytes(clientId));
            }
  +         }
            
            ValueBinding vb = getValueBinding("contentType");
            if (vb != null)
  @@ -111,9 +116,13 @@
         
         ValueBinding vb = getValueBinding("accept");
         if (vb != null)
  +      {
            writer.writeAttribute(HTML.ACCEPT_ATTR, vb.getValue(context), null);
  +      }
         else if (accept != null)
  +      {
            writer.writeAttribute(HTML.ACCEPT_ATTR, accept, null);         
  +      }
         
         writer.endElement(HTML.INPUT_ELEM);
      }