You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2011/04/02 02:47:49 UTC

svn commit: r1087946 - in /cxf/branches/2.3.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/interceptor/DocLiteralInInterceptor.java

Author: dkulp
Date: Sat Apr  2 00:47:48 2011
New Revision: 1087946

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

........
  r1087945 | dkulp | 2011-04-01 20:46:42 -0400 (Fri, 01 Apr 2011) | 3 lines
  
  [CXF-3413] If the number of elements in the body exceeds what the soap
  message expects, throw a proper fault and not an
  IndexOutOfBoundsException.
........

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/DocLiteralInInterceptor.java

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
    svn:mergeinfo = /cxf/trunk:1087945

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

Modified: cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/DocLiteralInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/DocLiteralInInterceptor.java?rev=1087946&r1=1087945&r2=1087946&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/DocLiteralInInterceptor.java (original)
+++ cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/DocLiteralInInterceptor.java Sat Apr  2 00:47:48 2011
@@ -184,8 +184,11 @@ public class DocLiteralInInterceptor ext
                     
                     if (msgInfo != null && msgInfo.getMessageParts() != null 
                         && msgInfo.getMessageParts().size() > 0) {
-                        assert msgInfo.getMessageParts().size() > paramNum;
-                        p = msgInfo.getMessageParts().get(paramNum);
+                        if (msgInfo.getMessageParts().size() > paramNum) {
+                            p = msgInfo.getMessageParts().get(paramNum);
+                        } else {
+                            p = null;
+                        }
                     } else {
                         p = findMessagePart(exchange, operations, elName, client, paramNum, message);
                     }