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 2012/09/27 19:35:03 UTC
svn commit: r1391128 -
/cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java
Author: dkulp
Date: Thu Sep 27 17:35:03 2012
New Revision: 1391128
URL: http://svn.apache.org/viewvc?rev=1391128&view=rev
Log:
Merged revisions 1391124 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
........
r1391124 | dkulp | 2012-09-27 13:33:40 -0400 (Thu, 27 Sep 2012) | 18 lines
Merged revisions 1391118 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........
r1391118 | dkulp | 2012-09-27 13:29:51 -0400 (Thu, 27 Sep 2012) | 10 lines
Merged revisions 1391102 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1391102 | dkulp | 2012-09-27 13:08:59 -0400 (Thu, 27 Sep 2012) | 2 lines
If the databinding is wrapper capable, the helper will be null. Return.
........
........
........
Modified:
cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java
Modified: cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java?rev=1391128&r1=1391127&r2=1391128&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java (original)
+++ cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java Thu Sep 27 17:35:03 2012
@@ -77,6 +77,9 @@ public class WrapperClassOutInterceptor
if (helper == null) {
helper = getWrapperHelper(message, messageInfo, wrappedMsgInfo, wrapped, parts.get(0));
}
+ if (helper == null) {
+ return;
+ }
try {
MessageContentsList newObjs = new MessageContentsList();