Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 22508 invoked from network); 20 Sep 2006 15:36:08 -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:08 -0000 Received: (qmail 2345 invoked by uid 500); 20 Sep 2006 15:36:07 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 2306 invoked by uid 500); 20 Sep 2006 15:36:07 -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 2281 invoked by uid 99); 20 Sep 2006 15:36:07 -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:07 -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:49221] helo=eris.apache.org) by idunn.apache.osuosl.org (ecelerity 2.1.1.8 r(12930)) with ESMTP id E7/05-01963-6EF51154 for ; Wed, 20 Sep 2006 08:36:06 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 69DC01A981D; Wed, 20 Sep 2006 08:36:04 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r448237 - /jackrabbit/trunk/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/version/UpdateInfo.java Date: Wed, 20 Sep 2006 15:36:04 -0000 To: commits@jackrabbit.apache.org From: angela@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20060920153604.69DC01A981D@eris.apache.org> X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: angela Date: Wed Sep 20 08:36:03 2006 New Revision: 448237 URL: http://svn.apache.org/viewvc?view=rev&rev=448237 Log: Building UpdateInfo from XML does not match description nor other constructions. multiple DAV:href elements may be present with the version elem., but never multiple version elements. Modified: jackrabbit/trunk/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/version/UpdateInfo.java Modified: jackrabbit/trunk/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/version/UpdateInfo.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/version/UpdateInfo.java?view=diff&rev=448237&r1=448236&r2=448237 ============================================================================== --- jackrabbit/trunk/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/version/UpdateInfo.java (original) +++ jackrabbit/trunk/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/version/UpdateInfo.java Wed Sep 20 08:36:03 2006 @@ -99,11 +99,13 @@ } boolean done = false; - ElementIterator it = DomUtil.getChildren(updateElement, XML_VERSION, NAMESPACE); - while (it.hasNext()) { + if (DomUtil.hasChildElement(updateElement, XML_VERSION, NAMESPACE)) { + Element vEl = DomUtil.getChildElement(updateElement, XML_VERSION, NAMESPACE); + ElementIterator hrefs = DomUtil.getChildren(vEl, DavConstants.XML_HREF, DavConstants.NAMESPACE); List hrefList = new ArrayList(); - Element el = it.nextElement(); - hrefList.add(DomUtil.getChildText(el, DavConstants.XML_HREF, DavConstants.NAMESPACE)); + while (hrefs.hasNext()) { + hrefList.add(DomUtil.getText(hrefs.nextElement())); + } source = (String[])hrefList.toArray(new String[hrefList.size()]); done = true; }