cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1368175 - /cxf/branches/2.4.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java
Date Wed, 01 Aug 2012 18:30:06 GMT
Author: dkulp
Date: Wed Aug  1 18:30:06 2012
New Revision: 1368175

URL: http://svn.apache.org/viewvc?rev=1368175&view=rev
Log:
Merged revisions 1368166 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes

........
  r1368166 | dkulp | 2012-08-01 14:28:11 -0400 (Wed, 01 Aug 2012) | 18 lines

  Merged revisions 1368112 via  git cherry-pick from
  https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes

  ........
    r1368112 | dkulp | 2012-08-01 12:42:30 -0400 (Wed, 01 Aug 2012) | 10 lines

    Merged revisions 1368100 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk

    ........
      r1368100 | dkulp | 2012-08-01 12:24:16 -0400 (Wed, 01 Aug 2012) | 2 lines

      [CXF-4448] Generate valid SOAP messages with @XmlList on doc/lit/bare

    ........

  ........

........

Modified:
    cxf/branches/2.4.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java

Modified: cxf/branches/2.4.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java?rev=1368175&r1=1368174&r2=1368175&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java
(original)
+++ cxf/branches/2.4.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java
Wed Aug  1 18:30:06 2012
@@ -33,7 +33,6 @@ import javax.xml.bind.PropertyException;
 import javax.xml.bind.ValidationEvent;
 import javax.xml.bind.ValidationEventHandler;
 import javax.xml.bind.attachment.AttachmentMarshaller;
-import javax.xml.namespace.QName;
 
 import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.common.logging.LogUtils;
@@ -171,9 +170,8 @@ public class DataWriterImpl<T> extends J
                     //RpcLit will use the JAXB Bridge to marshall part message when it is

                     //annotated with @XmlList,@XmlAttachmentRef,@XmlJavaTypeAdapter
                     //TODO:Cache the JAXBRIContext
-                    QName qname = new QName(null, part.getConcreteName().getLocalPart());
                     
-                    JAXBEncoderDecoder.marshalWithBridge(qname,
+                    JAXBEncoderDecoder.marshalWithBridge(part.getConcreteName(),
                                                          part.getTypeClass(),
                                                          anns, 
                                                          databinding.getContextClasses(),




Mime
View raw message