0023593: XCAFDoc_DocumentTool label must be removed from internal map upon closing...

diff --git a/src/XCAFDoc/XCAFDoc_DocumentTool.cdl b/src/XCAFDoc/XCAFDoc_DocumentTool.cdl
index a73e68b56a7f26a911d4f7145379492d248ec4ec..31488faca1b8b9bb56951f3523ef8f22cfcba73a 100755 (executable)
--- 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 0f72b927852357869201dbe447a45a2cccf4abca..464e53f2af19af95a1df7bf7048b4c109f14f9a3 100755 (executable)
--- 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 );
+  }
+}