svn commit: r1205787 - in /cxf/branches/2.4.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/multipart/

[sergeyb]

Author: sergeyb
Date: Thu Nov 24 11:02:12 2011
New Revision: 1205787

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

........
  r1205786 | sergeyb | 2011-11-24 10:58:59 +0000 (Thu, 24 Nov 2011) | 1 line
  
  [CXF-3933] Adding MultipartReadException
........

Added:
    
cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/multipart/MultipartReadException.java
      - copied unchanged from r1205786, 
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/multipart/MultipartReadException.java
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/provider/MultipartProvider.java
    
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 = /cxf/trunk:1205786

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/provider/MultipartProvider.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java?rev=1205787&r1=1205786&r2=1205787&view=diff
==============================================================================
--- 
cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java
 (original)
+++ 
cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java
 Thu Nov 24 11:02:12 2011
@@ -167,7 +167,7 @@ public class MultipartProvider extends A
         if (multipart != null) {
             return fromAttachment(multipart, c, t, anns);
         }
-        throw new WebApplicationException(404);
+        throw new WebApplicationException(400);
     }
     
     private Class<?> getActualType(Type type, int pos) {

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=1205787&r1=1205786&r2=1205787&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
 Thu Nov 24 11:02:12 2011
@@ -114,8 +114,8 @@ public final class AttachmentUtils {
                                                        id.value(),
                                                        mt.toString());
             LOG.warning(errorMsg.toString());
-            return null;
-            
+            throw new WebApplicationException(
+                      new MultipartReadException(id.value(), id.type(), 
errorMsg.toString()));
         }
         
         return infos.size() > 0 ? infos.get(0) : null;