cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1425022 - /cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
Date Fri, 21 Dec 2012 16:49:14 GMT
Author: dkulp
Date: Fri Dec 21 16:49:14 2012
New Revision: 1425022

URL: http://svn.apache.org/viewvc?rev=1425022&view=rev
Log:
Merged revisions 1425018 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes

........
  r1425018 | dkulp | 2012-12-21 11:47:33 -0500 (Fri, 21 Dec 2012) | 11 lines

  Merged revisions 1425012 via  git cherry-pick from
  https://svn.apache.org/repos/asf/cxf/trunk

  ........
    r1425012 | dkulp | 2012-12-21 11:40:35 -0500 (Fri, 21 Dec 2012) | 3 lines

    [CXF-4720] Match javadoc/spec on what threshold param means
    Patch from Han Hong Fang applied

  ........

........

Modified:
    cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java

Modified: cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java?rev=1425022&r1=1425021&r2=1425022&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
(original)
+++ cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
Fri Dec 21 16:49:14 2012
@@ -289,7 +289,7 @@ public final class AttachmentUtil {
 
     public static Attachment createMtomAttachment(boolean isXop, String mimeType, String
elementNS, 
                                                  byte[] data, int offset, int length, int
threshold) {
-        if (!isXop || length < threshold) {
+        if (!isXop || length <= threshold) {
             return null;
         }        
         if (mimeType == null) {



Mime
View raw message