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 2011/09/02 17:59:52 UTC
svn commit: r1164598 - in /cxf/branches/2.4.x-fixes: ./
rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
Author: dkulp
Date: Fri Sep 2 15:59:52 2011
New Revision: 1164598
URL: http://svn.apache.org/viewvc?rev=1164598&view=rev
Log:
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.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.4.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java?rev=1164598&r1=1164597&r2=1164598&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java (original)
+++ cxf/branches/2.4.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java Fri Sep 2 15:59:52 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))