From commits-return-12432-apmail-jackrabbit-commits-archive=jackrabbit.apache.org@jackrabbit.apache.org Wed Nov 16 12:56:54 2011 Return-Path: X-Original-To: apmail-jackrabbit-commits-archive@www.apache.org Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 705F19390 for ; Wed, 16 Nov 2011 12:56:54 +0000 (UTC) Received: (qmail 25102 invoked by uid 500); 16 Nov 2011 12:56:54 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 25060 invoked by uid 500); 16 Nov 2011 12:56:54 -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 25023 invoked by uid 99); 16 Nov 2011 12:56:54 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Nov 2011 12:56:54 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Nov 2011 12:56:50 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8F3B4238897A; Wed, 16 Nov 2011 12:56:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1202684 - in /jackrabbit/branches/2.2: ./ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/SessionImporter.java Date: Wed, 16 Nov 2011 12:56:29 -0000 To: commits@jackrabbit.apache.org From: jukka@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111116125629.8F3B4238897A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jukka Date: Wed Nov 16 12:56:29 2011 New Revision: 1202684 URL: http://svn.apache.org/viewvc?rev=1202684&view=rev Log: 2.2: Merged revision 1064213 (JCR-2863) Modified: jackrabbit/branches/2.2/ (props changed) jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/SessionImporter.java Propchange: jackrabbit/branches/2.2/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Nov 16 12:56:29 2011 @@ -3,4 +3,4 @@ /jackrabbit/sandbox/JCR-1456:774917-886178 /jackrabbit/sandbox/JCR-2170:812417-816332 /jackrabbit/sandbox/tripod-JCR-2209:795441-795863 -/jackrabbit/trunk:1038201,1038203,1038205,1038657,1039064,1039347,1039408,1039422-1039423,1039888,1039946,1040033,1040090,1040459,1040601,1040606,1040661,1040958,1041379,1041439,1041761,1042643,1042647,1042978-1042982,1043084-1043086,1043088,1043343,1043357-1043358,1043430,1043554,1043616,1043618,1043637,1043656,1043893,1043897,1044239,1044312,1044451,1044613,1049473,1049491,1049514,1049518,1049520,1049859,1049870,1049874,1049878,1049880,1049883,1049889,1049891,1049894-1049895,1049899-1049901,1049909-1049911,1049915-1049916,1049919,1049923,1049925,1049931,1049936,1049939,1050212,1050298,1050346,1050551,1055068,1055070-1055071,1055116-1055117,1055127,1055134,1055164,1055498,1060431,1060434,1060753,1063756,1064670,1065599,1065622,1066059,1066071,1066794,1069831,1071562,1071573,1071680,1074140,1079314,1079317,1080186,1080540,1087304,1088991,1089032,1089053,1089436,1092106,1092117,1092683,1097363,1097513-1097514,1098963-1098964,1099033,1099172,1100242,1100286,1101046,1102601,110 4027,1128175,1130192,1130228,1132993,1136353,1136360,1138511,1141141,1141717,1143396,1143738,1144332,1144338,1144695,1152258,1155431,1157175,1165609,1173196,1174822,1174887,1175988,1176423,1176465,1176515,1176546,1177249,1177340,1178251,1178892,1179548,1180922,1181712,1182281,1182667,1182929,1183409,1185691,1186285,1186802,1187344,1188541,1188590,1198827 +/jackrabbit/trunk:1038201,1038203,1038205,1038657,1039064,1039347,1039408,1039422-1039423,1039888,1039946,1040033,1040090,1040459,1040601,1040606,1040661,1040958,1041379,1041439,1041761,1042643,1042647,1042978-1042982,1043084-1043086,1043088,1043343,1043357-1043358,1043430,1043554,1043616,1043618,1043637,1043656,1043893,1043897,1044239,1044312,1044451,1044613,1049473,1049491,1049514,1049518,1049520,1049859,1049870,1049874,1049878,1049880,1049883,1049889,1049891,1049894-1049895,1049899-1049901,1049909-1049911,1049915-1049916,1049919,1049923,1049925,1049931,1049936,1049939,1050212,1050298,1050346,1050551,1055068,1055070-1055071,1055116-1055117,1055127,1055134,1055164,1055498,1060431,1060434,1060753,1063756,1064213,1064670,1065599,1065622,1066059,1066071,1066794,1069831,1071562,1071573,1071680,1074140,1079314,1079317,1080186,1080540,1087304,1088991,1089032,1089053,1089436,1092106,1092117,1092683,1097363,1097513-1097514,1098963-1098964,1099033,1099172,1100242,1100286,1101046,110 2601,1104027,1128175,1130192,1130228,1132993,1136353,1136360,1138511,1141141,1141717,1143396,1143738,1144332,1144338,1144695,1152258,1155431,1157175,1165609,1173196,1174822,1174887,1175988,1176423,1176465,1176515,1176546,1177249,1177340,1178251,1178892,1179548,1180922,1181712,1182281,1182667,1182929,1183409,1185691,1186285,1186802,1187344,1188541,1188590,1198827 Modified: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/SessionImporter.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/SessionImporter.java?rev=1202684&r1=1202683&r2=1202684&view=diff ============================================================================== --- jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/SessionImporter.java (original) +++ jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/SessionImporter.java Wed Nov 16 12:56:29 2011 @@ -195,10 +195,20 @@ public class SessionImporter implements } protected NodeImpl resolveUUIDConflict(NodeImpl parent, - NodeImpl conflicting, + NodeId conflictingId, NodeInfo nodeInfo) throws RepositoryException { NodeImpl node; + + NodeImpl conflicting; + try { + conflicting = session.getNodeById(conflictingId); + } catch (ItemNotFoundException infe) { + // conflicting node can't be read, + // most likely due to lack of read permission + conflicting = null; + } + if (uuidBehavior == ImportUUIDBehavior.IMPORT_UUID_CREATE_NEW) { // create new with new uuid checkPermission(parent, nodeInfo.getName()); @@ -210,7 +220,8 @@ public class SessionImporter implements } } else if (uuidBehavior == ImportUUIDBehavior.IMPORT_UUID_COLLISION_THROW) { // if conflicting node is shareable, then clone it - if (conflicting.isNodeType(NameConstants.MIX_SHAREABLE)) { + if (conflicting != null + && conflicting.isNodeType(NameConstants.MIX_SHAREABLE)) { parent.clone(conflicting, nodeInfo.getName()); return null; } @@ -218,6 +229,14 @@ public class SessionImporter implements log.debug(msg); throw new ItemExistsException(msg); } else if (uuidBehavior == ImportUUIDBehavior.IMPORT_UUID_COLLISION_REMOVE_EXISTING) { + if (conflicting == null) { + // since the conflicting node can't be read, + // we can't remove it + String msg = "node with uuid " + conflictingId + " cannot be removed"; + log.debug(msg); + throw new RepositoryException(msg); + } + // make sure conflicting node is not importTargetNode or an ancestor thereof if (importTargetNode.getPath().startsWith(conflicting.getPath())) { String msg = "cannot remove ancestor node"; @@ -232,6 +251,14 @@ public class SessionImporter implements nodeInfo.getNodeTypeName(), nodeInfo.getMixinNames(), nodeInfo.getId()); } else if (uuidBehavior == ImportUUIDBehavior.IMPORT_UUID_COLLISION_REPLACE_EXISTING) { + if (conflicting == null) { + // since the conflicting node can't be read, + // we can't replace it + String msg = "node with uuid " + conflictingId + " cannot be replaced"; + log.debug(msg); + throw new RepositoryException(msg); + } + if (conflicting.getDepth() == 0) { String msg = "root node cannot be replaced"; log.debug(msg); @@ -366,15 +393,19 @@ public class SessionImporter implements node = createNode(parent, nodeName, ntName, mixins, null); } else { // potential uuid conflict - NodeImpl conflicting; + boolean isConflicting; try { - conflicting = session.getNodeById(id); + // the following is a fail-fast test whether + // an item exists (regardless of access control) + session.getHierarchyManager().getName(id); + isConflicting = true; } catch (ItemNotFoundException infe) { - conflicting = null; + isConflicting = false; } - if (conflicting != null) { + + if (isConflicting) { // resolve uuid conflict - node = resolveUUIDConflict(parent, conflicting, nodeInfo); + node = resolveUUIDConflict(parent, id, nodeInfo); if (node == null) { // no new node has been created, so skip this node parents.push(null); // push null onto stack for skipped node