dbertoni 2005/04/29 13:21:02
Modified: c/src/xercesc/validators/common GrammarResolver.cpp
Log:
Patch for Jira issue XERCESC-1407.
Revision Changes Path
1.32 +13 -5
xml-xerces/c/src/xercesc/validators/common/GrammarResolver.cpp
Index: GrammarResolver.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/common/GrammarResolver.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- GrammarResolver.cpp 20 Mar 2005 14:53:35 -0000 1.31
+++ GrammarResolver.cpp 29 Apr 2005 20:21:02 -0000 1.32
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.32 2005/04/29 20:21:02 dbertoni
+ * Patch for Jira issue XERCESC-1407.
+ *
* Revision 1.31 2005/03/20 14:53:35 knoaman
* [jira 1381] Memory leak in GrammarResolver - patch by Christian Will.
*
@@ -446,11 +449,16 @@
{
if (fGrammarFromPool->containsKey(nameSpaceKey))
fGrammarFromPool->removeKey(nameSpaceKey);
- return grammar;
- }
- // It failed to remove it from the grammar pool either because it
- // didn't exist or because it is locked.
- return 0;
+ }
+ // Check to see if it's in fGrammarBucket, since
+ // we put it there if the grammar pool refused to
+ // cache it.
+ else if (fGrammarBucket->containsKey(nameSpaceKey))
+ {
+ grammar = fGrammarBucket->orphanKey(nameSpaceKey);
+ }
+
+ return grammar;
}
else
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
