Merge lp:~zorba-coders/zorba/bug1129950 into lp:zorba

[Juan Zacarias]

Fix for bug1129950 memory problem when closing xqxq

Fix for bug1129950 memory problem when closing xqxq

[Matthias Brantner (matthias-brantner)]

The expression can be simplified even more to

delete theQueryMap;

Where is the QueryData_t of a query deleted if the user doesn't invoke the DeleteQueryFunction function?

[Chris Hillery (ceejatec)]

I'm curious about the answer to Matthias' question as well. However, things run valgrind-clean (including no leaks) with and without the explicit call to xqxq:delete-query() in the query, so I'm assuming that it DOES get cleaned up somewhere.

review: Approve

[Chris Hillery (ceejatec)]

(My guess is that since theQueryMap contains QueryData_t objects - ie, smart pointers - they are reclaimed when theQueryMap is deleted because theQueryMap was the last object maintain a refcount on them.)

[Juan Zacarias (juan457)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1129950-2013-02-22T22-55-41.94Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug1129950-2013-02-22T22-55-41.94Z is finished. The final status was:

All tests succeeded!

=== modified file 'modules/xqxq/xqxq.xq.src/xqxq.cpp'
--- modules/xqxq/xqxq.xq.src/xqxq.cpp	2013-02-22 12:37:37 +0000
+++ modules/xqxq/xqxq.xq.src/xqxq.cpp	2013-02-22 17:14:26 +0000
@@ -203,12 +203,6 @@
 {
   if (theQueryMap)
   {
-    for (QueryMap_t::const_iterator lIter = theQueryMap->begin();
-         lIter != theQueryMap->end(); ++lIter)
-    {
-      deleteQuery(lIter->first);
-    }
-    theQueryMap->clear();
     delete theQueryMap;
   }
   delete this;