cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1164600 - in /cxf/branches/2.3.x-fixes: ./ rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
Date Fri, 02 Sep 2011 16:08:36 GMT
Author: dkulp
Date: Fri Sep  2 16:08:35 2011
New Revision: 1164600

URL: http://svn.apache.org/viewvc?rev=1164600&view=rev
Log:
Merged revisions 1164598 via svnmerge from 
https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes

................
  r1164598 | dkulp | 2011-09-02 11:59:52 -0400 (Fri, 02 Sep 2011) | 9 lines
  
  Merged revisions 1164594 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1164594 | dkulp | 2011-09-02 11:55:58 -0400 (Fri, 02 Sep 2011) | 1 line
    
    Fix a hanging test.
  ........
................

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java

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

Modified: cxf/branches/2.3.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java?rev=1164600&r1=1164599&r2=1164600&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
(original)
+++ cxf/branches/2.3.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
Fri Sep  2 16:08:35 2011
@@ -495,8 +495,10 @@ public final class JAXBEncoderDecoder {
 
                             f.set(obj, o);
                         } else {
-                            f.set(obj, u.unmarshal(reader, f.getType()));
+                            f.set(obj, getElementValue(u.unmarshal(reader, f.getType())));
                         }
+                    } else {
+                        throw new NoSuchFieldException("No accessible field " + q.getLocalPart());
                     }
                 } catch (NoSuchFieldException ex) {
                     String s = Character.toUpperCase(q.getLocalPart().charAt(0))



Mime
View raw message