cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r901343 - in /cxf/branches/2.2.x-fixes: ./ api/src/main/java/org/apache/cxf/databinding/AbstractWrapperHelper.java
Date Wed, 20 Jan 2010 19:30:10 GMT
Author: dkulp
Date: Wed Jan 20 19:30:09 2010
New Revision: 901343

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

........
  r901335 | dkulp | 2010-01-20 14:13:15 -0500 (Wed, 20 Jan 2010) | 1 line
  
  [CXF-2627] Add an NPE guard
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/databinding/AbstractWrapperHelper.java

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

Modified: cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/databinding/AbstractWrapperHelper.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/databinding/AbstractWrapperHelper.java?rev=901343&r1=901342&r2=901343&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/databinding/AbstractWrapperHelper.java
(original)
+++ cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/databinding/AbstractWrapperHelper.java
Wed Jan 20 19:30:09 2010
@@ -82,7 +82,7 @@
                 }
                 Object o = lst.get(x);
                 o = getPartObject(x, o);                
-                if (o instanceof List) {
+                if (o instanceof List && getMethods[x] != null) {
                     List<Object> col = CastUtils.cast((List)getMethods[x].invoke(wrapperObject));
                     if (col == null) {
                         //broken generated java wrappers



Mime
View raw message