svn commit: r993338 - in /cxf/branches/2.2.x-fixes: ./ rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataReaderImpl.java

[sergeyb]

Author: sergeyb
Date: Tue Sep  7 12:53:26 2010
New Revision: 993338

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

........
  r993332 | sergeyb | 2010-09-07 13:43:56 +0100 (Tue, 07 Sep 2010) | 1 line
  
  [CXF-2967] Updating DataReaderImpl to check the exchange for 
unwrap.jaxb.element as well
........

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

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep  7 12:53:26 2010
@@ -1 +1 @@
-/cxf/trunk:989123,989434,990386,990593,991324,991416,991797,991893,991923,991925-991927,992000,992464,992681,992686
+/cxf/trunk:989123,989434,990386,990593,991324,991416,991797,991893,991923,991925-991927,992000,992464,992681,992686,993332

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

Modified: 
cxf/branches/2.2.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataReaderImpl.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataReaderImpl.java?rev=993338&r1=993337&r2=993338&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataReaderImpl.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataReaderImpl.java
 Tue Sep  7 12:53:26 2010
@@ -70,6 +70,9 @@ public class DataReaderImpl<T> extends J
             setEventHandler = MessageUtils.getContextualBoolean(m, 
"set-jaxb-validation-event-handler", true);
             
             Object unwrapProperty = m.get(JAXBDataBinding.UNWRAP_JAXB_ELEMENT);
+            if (unwrapProperty == null) {
+                unwrapProperty = 
m.getExchange().get(JAXBDataBinding.UNWRAP_JAXB_ELEMENT);
+            }
             if (unwrapProperty != null) {
                 unwrapJAXBElement = Boolean.TRUE.equals(unwrapProperty);
             }