amassari 2003/10/23 14:19:58 Modified: c/src/xercesc/dom/impl DOMDocumentImpl.cpp DOMNodeImpl.cpp Log: Performance tweaks Revision Changes Path 1.49 +5 -4 xml-xerces/c/src/xercesc/dom/impl/DOMDocumentImpl.cpp Index: DOMDocumentImpl.cpp =================================================================== RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMDocumentImpl.cpp,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- DOMDocumentImpl.cpp 2 Oct 2003 09:33:23 -0000 1.48 +++ DOMDocumentImpl.cpp 23 Oct 2003 21:19:58 -0000 1.49 @@ -1328,8 +1328,9 @@ DOMDocument* doc = (DOMDocument*) this; fNode.callUserDataHandlers(DOMUserDataHandler::NODE_DELETED, 0, 0); - // notify userdatahandler first - releaseDocNotifyUserData(this); + // notify userdatahandler first, if we have some + if (fUserDataTable) + releaseDocNotifyUserData(this); // release the docType in case it was created from heap if (fDocType) { @@ -1339,7 +1340,7 @@ // delete the document memory pool delete doc; -}; +} void DOMDocumentImpl::releaseDocNotifyUserData(DOMNode* object) { 1.26 +4 -3 xml-xerces/c/src/xercesc/dom/impl/DOMNodeImpl.cpp Index: DOMNodeImpl.cpp =================================================================== RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMNodeImpl.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- DOMNodeImpl.cpp 24 Jul 2003 08:19:28 -0000 1.25 +++ DOMNodeImpl.cpp 23 Oct 2003 21:19:58 -0000 1.26 @@ -441,8 +441,9 @@ const DOMNode* src, const DOMNode* dst) const { - if (((DOMDocumentImpl*)getOwnerDocument())) - ((DOMDocumentImpl*)getOwnerDocument())->callUserDataHandlers(this, operation, src, dst); + DOMDocumentImpl* doc=(DOMDocumentImpl*)getOwnerDocument(); + if (doc) + doc->callUserDataHandlers(this, operation, src, dst); } bool DOMNodeImpl::isSameNode(const DOMNode* other) const
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]