axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject cvs commit: ws-axis/java/src/org/apache/axis/wsdl/toJava Utils.java
Date Mon, 12 Jan 2004 16:47:55 GMT
dims        2004/01/12 08:47:55

  Modified:    java/src/org/apache/axis/attachments AttachmentPart.java
               java/src/org/apache/axis/wsdl/toJava Utils.java
  Log:
  Fix for Bug 25616 - MIME type string check incorrect
  from ksmakoto@dd.iij4u.or.jp (KISHIMOTO, Makoto)
  
  Revision  Changes    Path
  1.42      +2 -2      ws-axis/java/src/org/apache/axis/attachments/AttachmentPart.java
  
  Index: AttachmentPart.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/attachments/AttachmentPart.java,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- AttachmentPart.java	1 Dec 2003 17:57:32 -0000	1.41
  +++ AttachmentPart.java	12 Jan 2004 16:47:55 -0000	1.42
  @@ -379,8 +379,8 @@
               }
           } else if (ds.getContentType().equals("text/xml")) {
               return new StreamSource(is);
  -        } else if (ds.getContentType().equals("text/gif") ||
  -                   ds.getContentType().equals("text/jpeg")) {
  +        } else if (ds.getContentType().equals("image/gif") ||
  +                   ds.getContentType().equals("image/jpeg")) {
               try {
                   return ImageIOFactory.getImageIO().loadImage(is);
               } catch (Exception ex) {
  
  
  
  1.82      +1 -1      ws-axis/java/src/org/apache/axis/wsdl/toJava/Utils.java
  
  Index: Utils.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/wsdl/toJava/Utils.java,v
  retrieving revision 1.81
  retrieving revision 1.82
  diff -u -r1.81 -r1.82
  --- Utils.java	10 Dec 2003 02:52:27 -0000	1.81
  +++ Utils.java	12 Jan 2004 16:47:55 -0000	1.82
  @@ -721,7 +721,7 @@
                   : mimeInfo.getDimensions();
   
           if (mimeType != null) {
  -            if (mimeType.equals("image/jpeg")) {
  +            if (mimeType.equals("image/gif") || mimeType.equals("image/jpeg")) {
                   return "(java.awt.Image" + mimeDimensions + ") " + var + ";";
               } else if (mimeType.equals("text/plain")) {
                   return "(java.lang.String" + mimeDimensions + ") " + var + ";";
  
  
  

Mime
View raw message