Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 89868 invoked from network); 11 Jan 2010 19:08:33 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 11 Jan 2010 19:08:33 -0000 Received: (qmail 8763 invoked by uid 500); 11 Jan 2010 19:08:33 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 8656 invoked by uid 500); 11 Jan 2010 19:08:33 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 8641 invoked by uid 99); 11 Jan 2010 19:08:32 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Jan 2010 19:08:32 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Jan 2010 19:08:32 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1FE5D23889BB; Mon, 11 Jan 2010 19:08:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r898007 - /cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java Date: Mon, 11 Jan 2010 19:08:12 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100111190812.1FE5D23889BB@eris.apache.org> Author: dkulp Date: Mon Jan 11 19:08:11 2010 New Revision: 898007 URL: http://svn.apache.org/viewvc?rev=898007&view=rev Log: FIx bad merge Modified: cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java Modified: cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java?rev=898007&r1=898006&r2=898007&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java (original) +++ cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java Mon Jan 11 19:08:11 2010 @@ -50,6 +50,7 @@ import javax.xml.transform.Source; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.sax.SAXSource; +import javax.xml.transform.stream.StreamSource; import org.w3c.dom.Attr; import org.w3c.dom.CDATASection;