From f898928aa049b20d54957cc3cc22ba4193ad8ab7 Mon Sep 17 00:00:00 2001 From: Roman Lygin Date: Wed, 28 Nov 2012 13:07:44 +0400 Subject: [PATCH] 0023593: XCAFDoc_DocumentTool label must be removed from internal map upon closing the XDE document --- src/XCAFDoc/XCAFDoc_DocumentTool.cdl | 5 +++++ src/XCAFDoc/XCAFDoc_DocumentTool.cxx | 20 ++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/src/XCAFDoc/XCAFDoc_DocumentTool.cdl b/src/XCAFDoc/XCAFDoc_DocumentTool.cdl index a73e68b56a..31488faca1 100755 --- a/src/XCAFDoc/XCAFDoc_DocumentTool.cdl +++ b/src/XCAFDoc/XCAFDoc_DocumentTool.cdl @@ -114,4 +114,9 @@ is Paste (me; into : mutable Attribute from TDF; RT : mutable RelocationTable from TDF); + Destroy (me: mutable) is virtual; + ---C++ : alias ~ + ---Purpose: Unregisters the document holding this attribute from an + -- internal global map of XDE documents. + end DocumentTool; diff --git a/src/XCAFDoc/XCAFDoc_DocumentTool.cxx b/src/XCAFDoc/XCAFDoc_DocumentTool.cxx index 0f72b92785..464e53f2af 100755 --- a/src/XCAFDoc/XCAFDoc_DocumentTool.cxx +++ b/src/XCAFDoc/XCAFDoc_DocumentTool.cxx @@ -280,3 +280,23 @@ Standard_Boolean XCAFDoc_DocumentTool::IsXCAFDocument(const Handle(TDocStd_Docu { return RootLDocLMap.IsBound(D->Main().Root()); } + + +//======================================================================= +//function : Destroy +//purpose : Removal of the document from RootLDocLMap is necessary. Otherwise +// there remains orphan labels and upon creation of a new +// label with XCAFDoc_DocumentTool attribute that +// orphan is attempted to get used (when hashes match) causing +// an exception when trying to access its data framework. +//======================================================================= + +void XCAFDoc_DocumentTool::Destroy() +{ + TDF_Label DocL = Label(); + if ( ! DocL.IsNull() ) { + TDF_Label RootL = DocL.Root(); + if ( RootLDocLMap.IsBound( RootL ) ) + RootLDocLMap.UnBind( RootL ); + } +}