[jbossws-commits] JBossWS SVN: r11348 - stack/native/branches/jbossws-native-3.1.2.SP4/modules/core/src/main/java/org/jboss/ws/core/utils.

[jbossws-commits at lists.jboss.org]

Author: richard.opalka at jboss.com
Date: 2009-12-22 09:16:55 -0500 (Tue, 22 Dec 2009)
New Revision: 11348

Modified:
   stack/native/branches/jbossws-native-3.1.2.SP4/modules/core/src/main/java/org/jboss/ws/core/utils/MimeUtils.java
Log:
[JBPAPP-3300] fixing issue

Modified: stack/native/branches/jbossws-native-3.1.2.SP4/modules/core/src/main/java/org/jboss/ws/core/utils/MimeUtils.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP4/modules/core/src/main/java/org/jboss/ws/core/utils/MimeUtils.java	2009-12-22 13:23:39 UTC (rev 11347)
+++ stack/native/branches/jbossws-native-3.1.2.SP4/modules/core/src/main/java/org/jboss/ws/core/utils/MimeUtils.java	2009-12-22 14:16:55 UTC (rev 11348)
@@ -22,15 +22,18 @@
 package org.jboss.ws.core.utils;
 
 import java.awt.image.BufferedImage;
-import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
+import javax.imageio.ImageIO;
+import javax.imageio.ImageReader;
+import javax.imageio.ImageWriter;
+import javax.imageio.stream.ImageInputStream;
+import javax.imageio.stream.ImageOutputStream;
 import javax.mail.internet.ContentType;
 import javax.mail.internet.MimeMultipart;
 import javax.mail.internet.ParseException;
@@ -42,10 +45,6 @@
 import org.jboss.wsf.common.IOUtils;
 import org.jboss.wsf.common.JavaUtils;
 
-import com.sun.image.codec.jpeg.JPEGCodec;
-import com.sun.image.codec.jpeg.JPEGImageDecoder;
-import com.sun.image.codec.jpeg.JPEGImageEncoder;
-
 /**
  * Generic mime utility class.
  *
@@ -218,15 +217,18 @@
    {
       public Object readFrom(InputStream in) {
          Object converted = null;
+         
          try
          {
-            JPEGImageDecoder dec = JPEGCodec.createJPEGDecoder(in);
-            BufferedImage bim = dec.decodeAsBufferedImage();
+            ImageReader decoder = ImageIO.getImageReadersByFormatName("JPEG").next();
+            ImageInputStream iis = ImageIO.createImageInputStream(in);
+            decoder.setInput(iis);
+            BufferedImage bim = decoder.read(0);
             converted = bim;
          }
          catch (Exception e)
          {
-            // ignore
+            e.printStackTrace();
          }
 
          return converted;
@@ -235,10 +237,12 @@
       public void writeTo(Object obj, OutputStream out) {
          if(obj instanceof BufferedImage)
          {
-            JPEGImageEncoder enc = JPEGCodec.createJPEGEncoder(out);
+            ImageWriter encoder = ImageIO.getImageWritersByFormatName("JPEG").next();
             try
             {
-               enc.encode((BufferedImage)obj);
+               ImageOutputStream ios = ImageIO.createImageOutputStream(out);
+               encoder.setOutput(ios);
+               encoder.write((BufferedImage)obj);
             }
             catch (IOException e)
             {