Author: ningjiang
Date: Mon Jun 7 08:11:44 2010
New Revision: 952135
URL: http://svn.apache.org/viewvc?rev=952135&view=rev
Log:
Merged revisions 952120 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r952120 | ningjiang | 2010-06-07 15:05:54 +0800 (Mon, 07 Jun 2010) | 1 line
CXF-2837 Add null pointer check in SoapOutInterceptor
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapOutInterceptor.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.2.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapOutInterceptor.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapOutInterceptor.java?rev=952135&r1=952134&r2=952135&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapOutInterceptor.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapOutInterceptor.java
Mon Jun 7 08:11:44 2010
@@ -223,6 +223,9 @@ public class SoapOutInterceptor extends
continue;
}
Object arg = objs.get(part);
+ if (arg == null) {
+ continue;
+ }
objs.remove(part);
if (!(startedHeader || preexistingHeaders)) {
try {
