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 2009/03/30 23:22:53 UTC
svn commit: r760180 - in /cxf/branches/2.1.x-fixes: ./
rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/AbstractJAXWSMethodInvoker.java
Author: dkulp
Date: Mon Mar 30 21:22:51 2009
New Revision: 760180
URL: http://svn.apache.org/viewvc?rev=760180&view=rev
Log:
Merged revisions 760178 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r760178 | dkulp | 2009-03-30 17:15:23 -0400 (Mon, 30 Mar 2009) | 2 lines
[CXF-2122] Fix potential NPE in the method invoker. Fix from Richard Opalka applied.
........
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/AbstractJAXWSMethodInvoker.java
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 30 21:22:51 2009
@@ -1 +1 @@
-/cxf/trunk:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,759961,759963-759964,759966,760029,760073,760150
+/cxf/trunk:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,759961,759963-759964,759966,760029,760073,760150,760178
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/AbstractJAXWSMethodInvoker.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/AbstractJAXWSMethodInvoker.java?rev=760180&r1=760179&r2=760180&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/AbstractJAXWSMethodInvoker.java (original)
+++ cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/AbstractJAXWSMethodInvoker.java Mon Mar 30 21:22:51 2009
@@ -127,9 +127,11 @@
List list = (List) ctx.get(Header.HEADER_LIST);
if (list != null && !list.isEmpty()) {
SoapMessage sm = (SoapMessage) createResponseMessage(exchange);
- Iterator iter = list.iterator();
- while (iter.hasNext()) {
- sm.getHeaders().add((Header) iter.next());
+ if (sm != null) {
+ Iterator iter = list.iterator();
+ while (iter.hasNext()) {
+ sm.getHeaders().add((Header) iter.next());
+ }
}
}
}