svn commit: r991418 - in /cxf/branches/2.2.x-fixes: ./ rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java

[ningjiang]

Author: ningjiang
Date: Wed Sep  1 02:02:31 2010
New Revision: 991418

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

........
  r991416 | ningjiang | 2010-09-01 09:46:10 +0800 (Wed, 01 Sep 2010) | 1 line
  
  CXF-2956 applied patch with thanks to William
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    
cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep  1 02:02:31 2010
@@ -1 +1 @@
-/cxf/trunk:989123,989434,990386,990593,991324
+/cxf/trunk:989123,989434,990386,990593,991324,991416

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

Modified: 
cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java?rev=991418&r1=991417&r2=991418&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
 Wed Sep  1 02:02:31 2010
@@ -108,7 +108,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;