cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1023069 - in /cxf/branches/2.3.x-fixes: ./ common/common/src/main/java/org/apache/cxf/helpers/ rt/core/src/main/java/org/apache/cxf/attachment/ rt/core/src/test/java/org/apache/cxf/attachment/
Date Fri, 15 Oct 2010 18:55:00 GMT
Author: dkulp
Date: Fri Oct 15 18:55:00 2010
New Revision: 1023069

URL: http://svn.apache.org/viewvc?rev=1023069&view=rev
Log:
Merged revisions 1023068 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1023068 | dkulp | 2010-10-15 14:53:40 -0400 (Fri, 15 Oct 2010) | 1 line
  
  [CXF-3068] Make sure the streams don't return 0 for anything.
........

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/IOUtils.java
    cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/attachment/MimeBodyPartInputStream.java
    cxf/branches/2.3.x-fixes/rt/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java

Propchange: cxf/branches/2.3.x-fixes/
            ('svn:mergeinfo' removed)

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Oct 15 18:55:00 2010
@@ -1 +1 @@
-/cxf/trunk:1-1022129,1022154,1022194,1022401-1022402,1022911
+/cxf/trunk:1-1022129,1022154,1022194,1022401-1022402,1022911,1023068

Modified: cxf/branches/2.3.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/IOUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/IOUtils.java?rev=1023069&r1=1023068&r2=1023069&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/IOUtils.java
(original)
+++ cxf/branches/2.3.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/IOUtils.java
Fri Oct 15 18:55:00 2010
@@ -134,6 +134,9 @@ public final class IOUtils {
         n = input.read(buffer);
         int total = 0;
         while (-1 != n) {
+            if (n == 0) {
+                throw new IOException("0 bytes read in violation of InputStream.read(byte[])");
+            }
             output.write(buffer, 0, n);
             total += n;
             n = input.read(buffer);
@@ -147,6 +150,9 @@ public final class IOUtils {
         int n = 0;
         n = input.read(buffer);
         while (-1 != n) {
+            if (n == 0) {
+                throw new IOException("0 bytes read in violation of InputStream.read(byte[])");
+            }
             output.write(buffer, 0, n);
             n = input.read(buffer);
         }
@@ -169,6 +175,9 @@ public final class IOUtils {
         int n = 0;
         n = input.read(buffer);
         while (-1 != n) {
+            if (n == 0) {
+                throw new IOException("0 bytes read in violation of InputStream.read(byte[])");
+            }
             buf.append(newStringFromBytes(buffer, 0, n));
             n = input.read(buffer);
         }
@@ -183,6 +192,9 @@ public final class IOUtils {
         int n = 0;
         n = input.read(buffer);
         while (-1 != n) {
+            if (n == 0) {
+                throw new IOException("0 bytes read in violation of InputStream.read(byte[])");
+            }
             buf.append(new String(buffer, 0, n));
             n = input.read(buffer);
         }

Modified: cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/attachment/MimeBodyPartInputStream.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/attachment/MimeBodyPartInputStream.java?rev=1023069&r1=1023068&r2=1023069&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/attachment/MimeBodyPartInputStream.java
(original)
+++ cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/attachment/MimeBodyPartInputStream.java
Fri Oct 15 18:55:00 2010
@@ -70,9 +70,20 @@ public class MimeBodyPartInputStream ext
         if (len > pbAmount) {
             len = pbAmount;  //can only pushback that much so make sure we can
         }
-        if (len > 0) {
-            len = inStream.read(b, off, len);
+        int read = 0;
+        int idx = 0;
+        while (read >= 0 && idx < len && idx < (boundary.length
* 2)) {
+            //make sure we read enough to detect the boundary
+            read = inStream.read(b, off + idx, len - idx);
+            if (read != -1) {
+                idx += read;
+            }
+        }
+        if (read == -1 && idx == 0) {
+            return -1;
         }
+        len = idx;
+        
         int i = processBuffer(b, off, len);
         if (bufferCreated && i > 0) {
             // read more than we need, push it back
@@ -86,6 +97,7 @@ public class MimeBodyPartInputStream ext
         } else if (i == 0 && boundaryFound) {
             return -1;
         }
+        
         return i;
     }
 

Modified: cxf/branches/2.3.x-fixes/rt/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java?rev=1023069&r1=1023068&r2=1023069&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java
(original)
+++ cxf/branches/2.3.x-fixes/rt/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java
Fri Oct 15 18:55:00 2010
@@ -20,6 +20,7 @@ package org.apache.cxf.attachment;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.PushbackInputStream;
 import java.util.Collection;
@@ -396,5 +397,64 @@ public class AttachmentDeserializerTest 
         message.getAttachments().size();
 
     }
+    @Test
+    public void testDoesntReturnZero() throws Exception {
+        String contentType = "multipart/mixed;boundary=----=_Part_1";
+        byte[] messageBytes = (
+                  "------=_Part_1\n\n"
+                + "JJJJ\n"
+                + "------=_Part_1"
+                + "\n\nContent-Transfer-Encoding: binary\n\n"
+                + "ABCD1\r\n"
+                + "------=_Part_1"
+                + "\n\nContent-Transfer-Encoding: binary\n\n"
+                + "ABCD2\r\n"
+                + "------=_Part_1"
+                + "\n\nContent-Transfer-Encoding: binary\n\n"
+                + "ABCD3\r\n"
+                + "------=_Part_1--").getBytes("UTF-8");
+        ByteArrayInputStream in = new ByteArrayInputStream(messageBytes) {
+            public int read(byte[] b, int off, int len) {
+                return super.read(b, off, len >= 2 ? 2 : len); 
+            }
+        };
+        
+        Message message = new MessageImpl();
+        message.put(Message.CONTENT_TYPE, contentType);
+        message.setContent(InputStream.class, in);
+        message.put(AttachmentDeserializer.ATTACHMENT_DIRECTORY, System
+                .getProperty("java.io.tmpdir"));
+        message.put(AttachmentDeserializer.ATTACHMENT_MEMORY_THRESHOLD, String
+                .valueOf(AttachmentDeserializer.THRESHOLD));
+
+
+        AttachmentDeserializer ad 
+            = new AttachmentDeserializer(message, 
+                                         Collections.singletonList("multipart/mixed"));
+
+        ad.initializeAttachments();
+        
+        String s = getString(message.getContent(InputStream.class));
+        assertEquals("JJJJ", s.trim());
+        int count = 1;
+        for (Attachment a : message.getAttachments()) {
+            s = getString(a.getDataHandler().getInputStream());
+            assertEquals("ABCD" + count++, s);
+        }
+    }
+    
+    private String getString(InputStream ins) throws Exception {
+        ByteArrayOutputStream bout = new ByteArrayOutputStream(100);
+        byte b[] = new byte[100];
+        int i = ins.read(b);
+        while (i > 0) {
+            bout.write(b, 0 , i);
+            i = ins.read(b);
+        }
+        if (i == 0) {
+            throw new IOException("Should not be 0");
+        }
+        return bout.toString();
+    }
 
 }
\ No newline at end of file



Mime
View raw message