From jackrabbit-commits-return-1018-apmail-incubator-jackrabbit-commits-archive=www.apache.org@incubator.apache.org Wed May 25 13:02:16 2005 Return-Path: Delivered-To: apmail-incubator-jackrabbit-commits-archive@www.apache.org Received: (qmail 79470 invoked from network); 25 May 2005 13:02:16 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 25 May 2005 13:02:16 -0000 Received: (qmail 75667 invoked by uid 500); 25 May 2005 13:02:15 -0000 Mailing-List: contact jackrabbit-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: jackrabbit-dev@incubator.apache.org Delivered-To: mailing list jackrabbit-commits@incubator.apache.org Received: (qmail 75653 invoked by uid 500); 25 May 2005 13:02:14 -0000 Delivered-To: apmail-incubator-jackrabbit-cvs@incubator.apache.org Received: (qmail 75645 invoked by uid 99); 25 May 2005 13:02:14 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Wed, 25 May 2005 06:02:13 -0700 Received: (qmail 79434 invoked by uid 65534); 25 May 2005 13:02:09 -0000 Message-ID: <20050525130209.79433.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: svn commit: r178431 - in /incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core: NodeImpl.java SessionImpl.java Date: Wed, 25 May 2005 13:02:09 -0000 To: jackrabbit-cvs@incubator.apache.org From: stefan@apache.org X-Mailer: svnmailer-1.0.0-dev X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: stefan Date: Wed May 25 06:02:08 2005 New Revision: 178431 URL: http://svn.apache.org/viewcvs?rev=3D178431&view=3Drev Log: - minor change in internal implementation of a 'rename only' move operation Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/NodeImpl= .java incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/SessionI= mpl.java Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/No= deImpl.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/= apache/jackrabbit/core/NodeImpl.java?rev=3D178431&r1=3D178430&r2=3D178431&v= iew=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/NodeImpl= .java (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/NodeImpl= .java Wed May 25 06:02:08 2005 @@ -546,19 +546,14 @@ return (NodeImpl) itemMgr.getItem(targetId); } =20 - protected NodeImpl renameChildNodeLink(QName oldName, int index, Strin= g uuid, QName newName) + protected void renameChildNodeLink(QName oldName, int index, String uu= id, + QName newName) throws RepositoryException { // modify the state of 'this', i.e. the parent node NodeState thisState =3D (NodeState) getOrCreateTransientItemState(= ); thisState.removeChildNodeEntry(oldName, index); thisState.addChildNodeEntry(newName, uuid); - - // create transient state of target, so that it gets modified. - NodeImpl target =3D (NodeImpl) itemMgr.getItem(new NodeId(uuid)); - target.getOrCreateTransientItemState(); - return target; } - =20 protected void removeChildProperty(String propName) throws RepositoryE= xception { QName qName; Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/Se= ssionImpl.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/= apache/jackrabbit/core/SessionImpl.java?rev=3D178431&r1=3D178430&r2=3D17843= 1&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/SessionI= mpl.java (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/SessionI= mpl.java Wed May 25 06:02:08 2005 @@ -929,13 +929,8 @@ srcParentNode.removeChildNode(srcName.getName(), index); } =20 - // change definition of target if necessary - NodeDefinitionImpl oldTargetDef =3D (NodeDefinitionImpl) targetNod= e=2EgetDefinition(); - NodeDefId oldTargetDefId =3D oldTargetDef.unwrap().getId(); - NodeDefId newTargetDefId =3D newTargetDef.unwrap().getId(); - if (!oldTargetDefId.equals(newTargetDefId)) { - targetNode.onRedefine(newTargetDefId); - } + // change definition of target + targetNode.onRedefine(newTargetDef.unwrap().getId()); } =20 /**