From fe5fa659377bafdd63f799436497a645f5aa4efb Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Tue, 30 Mar 2004 14:01:16 +0000 Subject: INTEGRATION: CWS cfg04 (1.5.62); FILE MERGED 2003/12/01 11:20:41 ssmith 1.5.62.1: merge from apoco2 --- configmgr/source/tree/updatehelper.cxx | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'configmgr/source') diff --git a/configmgr/source/tree/updatehelper.cxx b/configmgr/source/tree/updatehelper.cxx index da6e3252651f..9261b6fd4f27 100644 --- a/configmgr/source/tree/updatehelper.cxx +++ b/configmgr/source/tree/updatehelper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: updatehelper.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: kz $ $Date: 2004-03-23 10:29:58 $ + * last change: $Author: rt $ $Date: 2004-03-30 15:01:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -266,7 +266,11 @@ public: SubtreeChange aActualChanges(_anUpdateTree, SubtreeChange::NoChildCopy()); if ( adjust_helper(aActualChanges,_anUpdateTree, _anUpdateAccess, _aRootNode) ) + { applyUpdateToTree(aActualChanges, _anUpdateAccess, _aRootNode); + } + _anUpdateTree.swap(aActualChanges); + } //-------------------------------------------------------------------------- //-------------------------------------------------------------------------- @@ -619,8 +623,6 @@ void ApplyUpdate::handle(RemoveNode& _rChange) { data::NodeAccess aChildNode = data::getSubnode(m_aCacheNode,getNodeName(_aNewNode)); - OSL_ENSURE(aChildNode.isValid(), "TreeDifferenceBuilder: could not find expected node !"); - if (aChildNode.isValid()) { OSL_ENSURE( data::GroupNodeAccess::isInstance(aChildNode) || -- cgit