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

[dkulp]

Author: dkulp
Date: Thu Oct 15 16:08:25 2009
New Revision: 825543

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

........
  r825531 | dkulp | 2009-10-15 11:50:01 -0400 (Thu, 15 Oct 2009) | 1 line
  
  [CXF-2474] Detect if the reader is the same and punt out
........

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

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

Modified: 
cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/DocLiteralInInterceptor.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/DocLiteralInInterceptor.java?rev=825543&r1=825542&r2=825543&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/DocLiteralInInterceptor.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/DocLiteralInInterceptor.java
 Thu Oct 15 16:08:25 2009
@@ -189,7 +189,7 @@
                     parameters.put(p, o);
                     
                     paramNum++;
-                    if (message.getContent(XMLStreamReader.class) == null) {
+                    if (message.getContent(XMLStreamReader.class) == null || o 
== xmlReader) {
                         xmlReader = null;
                     }
                 } while (xmlReader != null && 
StaxUtils.toNextElement(xmlReader));