Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 53449 invoked from network); 28 Apr 2006 15:56:49 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 28 Apr 2006 15:56:49 -0000 Received: (qmail 67447 invoked by uid 500); 28 Apr 2006 15:56:48 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 67406 invoked by uid 500); 28 Apr 2006 15:56:48 -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 67389 invoked by uid 99); 28 Apr 2006 15:56:48 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Apr 2006 08:56:48 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 28 Apr 2006 08:56:47 -0700 Received: (qmail 53144 invoked by uid 65534); 28 Apr 2006 15:56:27 -0000 Message-ID: <20060428155627.53143.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r397937 - /jackrabbit/trunk/jcr-server/server/src/java/org/apache/jackrabbit/webdav/jcr/property/NamespacesProperty.java Date: Fri, 28 Apr 2006 15:56:26 -0000 To: commits@jackrabbit.apache.org From: angela@apache.org X-Mailer: svnmailer-1.0.8 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: angela Date: Fri Apr 28 08:56:25 2006 New Revision: 397937 URL: http://svn.apache.org/viewcvs?rev=397937&view=rev Log: NamespacesProperty: missing assertion for non-null prefix/uri Modified: jackrabbit/trunk/jcr-server/server/src/java/org/apache/jackrabbit/webdav/jcr/property/NamespacesProperty.java Modified: jackrabbit/trunk/jcr-server/server/src/java/org/apache/jackrabbit/webdav/jcr/property/NamespacesProperty.java URL: http://svn.apache.org/viewcvs/jackrabbit/trunk/jcr-server/server/src/java/org/apache/jackrabbit/webdav/jcr/property/NamespacesProperty.java?rev=397937&r1=397936&r2=397937&view=diff ============================================================================== --- jackrabbit/trunk/jcr-server/server/src/java/org/apache/jackrabbit/webdav/jcr/property/NamespacesProperty.java (original) +++ jackrabbit/trunk/jcr-server/server/src/java/org/apache/jackrabbit/webdav/jcr/property/NamespacesProperty.java Fri Apr 28 08:56:25 2006 @@ -21,6 +21,7 @@ import org.apache.jackrabbit.webdav.property.AbstractDavProperty; import org.apache.jackrabbit.webdav.property.DavProperty; import org.apache.jackrabbit.webdav.xml.DomUtil; +import org.apache.jackrabbit.webdav.xml.Namespace; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.w3c.dom.Document; @@ -72,8 +73,10 @@ if (listEntry instanceof Element) { Element e = (Element)listEntry; if (XML_NAMESPACE.equals(e.getLocalName())) { - String prefix = DomUtil.getChildText(e, XML_PREFIX, ItemResourceConstants.NAMESPACE); - String uri = DomUtil.getChildText(e, XML_URI, ItemResourceConstants.NAMESPACE); + Element pElem = DomUtil.getChildElement(e, XML_PREFIX, ItemResourceConstants.NAMESPACE); + String prefix = DomUtil.getText(pElem, Namespace.EMPTY_NAMESPACE.getPrefix()); + Element uElem = DomUtil.getChildElement(e, XML_URI, ItemResourceConstants.NAMESPACE); + String uri = DomUtil.getText(uElem, Namespace.EMPTY_NAMESPACE.getURI()); value.setProperty(prefix, uri); } }