You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cxf.apache.org by ni...@apache.org on 2010/09/01 03:46:10 UTC

svn commit: r991416 - /cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java

Author: ningjiang
Date: Wed Sep  1 01:46:10 2010
New Revision: 991416

URL: http://svn.apache.org/viewvc?rev=991416&view=rev
Log:
CXF-2956 applied patch with thanks to William

Modified:
    cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java

Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java?rev=991416&r1=991415&r2=991416&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java Wed Sep  1 01:46:10 2010
@@ -110,7 +110,7 @@ public class WrapperClassInInterceptor e
             MessagePartInfo wrapperPart = wrappedMessageInfo.getMessagePart(0);
             Class<?> wrapperClass = wrapperPart.getTypeClass();
             Object wrappedObject = lst.get(wrapperPart.getIndex());
-            if (!wrapperClass.isInstance(wrappedObject)) {
+            if (wrapperClass != null && !wrapperClass.isInstance(wrappedObject)) {
                 wrappedObject = null;
                 wrapperPart = null;
                 wrapperClass = null;