Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 88414 invoked from network); 23 Nov 2006 19:06:18 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 23 Nov 2006 19:06:18 -0000 Received: (qmail 39835 invoked by uid 500); 23 Nov 2006 19:06:28 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 39748 invoked by uid 500); 23 Nov 2006 19:06:28 -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 39739 invoked by uid 99); 23 Nov 2006 19:06:28 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Nov 2006 11:06:28 -0800 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 [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Nov 2006 11:06:17 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id B3D631A9846; Thu, 23 Nov 2006 11:05:42 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r478642 - /jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/NodeImpl.java Date: Thu, 23 Nov 2006 19:05:42 -0000 To: commits@jackrabbit.apache.org From: tripod@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061123190542.B3D631A9846@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tripod Date: Thu Nov 23 11:05:41 2006 New Revision: 478642 URL: http://svn.apache.org/viewvc?view=rev&rev=478642 Log: JCR-664 (reverting changes) Modified: jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/NodeImpl.java Modified: jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/NodeImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/NodeImpl.java?view=diff&rev=478642&r1=478641&r2=478642 ============================================================================== --- jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/NodeImpl.java (original) +++ jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/NodeImpl.java Thu Nov 23 11:05:41 2006 @@ -16,7 +16,6 @@ */ package org.apache.jackrabbit.core; -import org.apache.jackrabbit.core.lock.LockManager; import org.apache.jackrabbit.core.nodetype.EffectiveNodeType; import org.apache.jackrabbit.core.nodetype.NodeDef; import org.apache.jackrabbit.core.nodetype.NodeDefId; @@ -34,22 +33,23 @@ import org.apache.jackrabbit.core.state.NodeState; import org.apache.jackrabbit.core.state.PropertyState; import org.apache.jackrabbit.core.value.InternalValue; -import org.apache.jackrabbit.core.version.DateVersionSelector; +import org.apache.jackrabbit.core.version.LabelVersionSelector; import org.apache.jackrabbit.core.version.InternalFreeze; import org.apache.jackrabbit.core.version.InternalFrozenNode; import org.apache.jackrabbit.core.version.InternalFrozenVersionHistory; -import org.apache.jackrabbit.core.version.LabelVersionSelector; -import org.apache.jackrabbit.core.version.VersionImpl; import org.apache.jackrabbit.core.version.VersionSelector; +import org.apache.jackrabbit.core.version.DateVersionSelector; +import org.apache.jackrabbit.core.version.VersionImpl; +import org.apache.jackrabbit.core.lock.LockManager; import org.apache.jackrabbit.name.IllegalNameException; import org.apache.jackrabbit.name.MalformedPathException; import org.apache.jackrabbit.name.NameException; -import org.apache.jackrabbit.name.NameFormat; import org.apache.jackrabbit.name.NoPrefixDeclaredException; import org.apache.jackrabbit.name.Path; -import org.apache.jackrabbit.name.PathFormat; import org.apache.jackrabbit.name.QName; import org.apache.jackrabbit.name.UnknownPrefixException; +import org.apache.jackrabbit.name.PathFormat; +import org.apache.jackrabbit.name.NameFormat; import org.apache.jackrabbit.util.ChildrenCollectorFilter; import org.apache.jackrabbit.util.IteratorHelper; import org.apache.jackrabbit.uuid.UUID; @@ -57,17 +57,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.BitSet; -import java.util.Calendar; -import java.util.Collections; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Set; - import javax.jcr.AccessDeniedException; import javax.jcr.InvalidItemStateException; import javax.jcr.Item; @@ -98,6 +87,16 @@ import javax.jcr.version.VersionException; import javax.jcr.version.VersionHistory; import javax.jcr.version.VersionIterator; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.BitSet; +import java.util.Calendar; +import java.util.Collections; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; /** * NodeImpl implements the Node interface. @@ -2552,8 +2551,10 @@ QName ntName; try { ntName = NameFormat.parse(nodeTypeName, session.getNamespaceResolver()); - } catch (Exception ine) { - return false; + } catch (IllegalNameException ine) { + throw new RepositoryException("invalid node type name: " + nodeTypeName, ine); + } catch (UnknownPrefixException upe) { + throw new RepositoryException("invalid node type name: " + nodeTypeName, upe); } return isNodeType(ntName); }