cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1221778 - in /cxf/branches/2.4.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/multipart/AttachmentUtils.java
Date Wed, 21 Dec 2011 15:57:01 GMT
Author: sergeyb
Date: Wed Dec 21 15:57:00 2011
New Revision: 1221778

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

........
  r1221776 | sergeyb | 2011-12-21 15:50:56 +0000 (Wed, 21 Dec 2011) | 1 line
  
  Fixing the multipart test failure
........

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/multipart/AttachmentUtils.java

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 21 15:57:00 2011
@@ -1 +1 @@
-/cxf/trunk:1221204,1221208,1221221,1221226,1221511,1221519,1221709
+/cxf/trunk:1221204,1221208,1221221,1221226,1221511,1221519,1221709,1221776

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/multipart/AttachmentUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/multipart/AttachmentUtils.java?rev=1221778&r1=1221777&r2=1221778&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/multipart/AttachmentUtils.java
(original)
+++ cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/multipart/AttachmentUtils.java
Wed Dec 21 15:57:00 2011
@@ -117,6 +117,8 @@ public final class AttachmentUtils {
                 LOG.warning(errorMsg.toString());
                 throw new WebApplicationException(
                           new MultipartReadException(id.value(), id.type(), errorMsg.toString()));
+            } else {
+                return null;
             }
         }
         



Mime
View raw message