Author: dkulp Date: Wed Oct 9 14:46:50 2013 New Revision: 1530649 URL: http://svn.apache.org/r1530649 Log: Merged revisions 1530647 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........ r1530647 | dkulp | 2013-10-09 10:45:49 -0400 (Wed, 09 Oct 2013) | 10 lines Merged revisions 1530638 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1530638 | dkulp | 2013-10-09 10:39:53 -0400 (Wed, 09 Oct 2013) | 2 lines [CXF-5326] Fix references to the wrong DOMUtils ........ ........ Modified: cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalMessageImpl.java Modified: cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalMessageImpl.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalMessageImpl.java?rev=1530649&r1=1530648&r2=1530649&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalMessageImpl.java (original) +++ cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalMessageImpl.java Wed Oct 9 14:46:50 2013 @@ -44,13 +44,12 @@ import org.w3c.dom.DocumentFragment; import org.w3c.dom.Element; import org.w3c.dom.Node; -import com.ibm.wsdl.util.xml.DOMUtils; - import org.apache.cxf.binding.soap.SoapMessage; import org.apache.cxf.binding.soap.saaj.SAAJFactoryResolver; import org.apache.cxf.binding.soap.saaj.SAAJUtils; import org.apache.cxf.common.WSDLConstants; import org.apache.cxf.common.logging.LogUtils; +import org.apache.cxf.helpers.DOMUtils; import org.apache.cxf.interceptor.Fault; import org.apache.cxf.io.CachedOutputStream; import org.apache.cxf.message.Message; @@ -205,7 +204,7 @@ public class LogicalMessageImpl implemen } else { s = new DOMSource(SAAJUtils.getBody(m).getFirstChild()); } - W3CDOMStreamReader r = new W3CDOMStreamReader(DOMUtils.getFirstChildElement(SAAJUtils.getBody(m))); + W3CDOMStreamReader r = new W3CDOMStreamReader(DOMUtils.getFirstElement(SAAJUtils.getBody(m))); message.setContent(XMLStreamReader.class, r); } catch (Exception e) { throw new Fault(e);
