From commits-return-2854-apmail-jackrabbit-commits-archive=jackrabbit.apache.org@jackrabbit.apache.org Wed Sep 20 15:36:52 2006 Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 22678 invoked from network); 20 Sep 2006 15:36:52 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 20 Sep 2006 15:36:52 -0000 Received: (qmail 3059 invoked by uid 500); 20 Sep 2006 15:36:51 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 3036 invoked by uid 500); 20 Sep 2006 15:36:51 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 3027 invoked by uid 99); 20 Sep 2006 15:36:51 -0000 Received: from idunn.apache.osuosl.org (HELO idunn.apache.osuosl.org) (140.211.166.84) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Sep 2006 08:36:51 -0700 X-ASF-Spam-Status: No, hits=-9.8 required=5.0 tests=ALL_TRUSTED,NO_REAL_NAME Received: from [140.211.166.113] ([140.211.166.113:62804] helo=eris.apache.org) by idunn.apache.osuosl.org (ecelerity 2.1.1.8 r(12930)) with ESMTP id 0E/05-01963-31061154 for ; Wed, 20 Sep 2006 08:36:51 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 1B6E91A9820; Wed, 20 Sep 2006 08:36:49 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r448239 - /jackrabbit/trunk/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/version/MergeInfo.java Date: Wed, 20 Sep 2006 15:36:49 -0000 To: commits@jackrabbit.apache.org From: angela@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20060920153649.1B6E91A9820@eris.apache.org> X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: angela Date: Wed Sep 20 08:36:48 2006 New Revision: 448239 URL: http://svn.apache.org/viewvc?view=rev&rev=448239 Log: simplify (using DomUtil method) Modified: jackrabbit/trunk/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/version/MergeInfo.java Modified: jackrabbit/trunk/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/version/MergeInfo.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/version/MergeInfo.java?view=diff&rev=448239&r1=448238&r2=448239 ============================================================================== --- jackrabbit/trunk/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/version/MergeInfo.java (original) +++ jackrabbit/trunk/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/version/MergeInfo.java Wed Sep 20 08:36:48 2006 @@ -169,7 +169,7 @@ Element mergeElem = DomUtil.createElement(factory, XML_MERGE, NAMESPACE); Element source = DomUtil.addChildElement(mergeElem, DavConstants.XML_SOURCE, DavConstants.NAMESPACE); for (int i = 0; i < mergeSource.length; i++) { - DomUtil.addChildElement(source, DavConstants.XML_HREF, DavConstants.NAMESPACE, mergeSource[i]); + source.appendChild(DomUtil.hrefToXml(mergeSource[i], factory)); } if (isNoAutoMerge) { DomUtil.addChildElement(mergeElem, XML_N0_AUTO_MERGE, NAMESPACE);