Merge lp:~zorba-coders/zorba/bug-1027142-process-leak into lp:zorba/process-module

[Chris Hillery]

Clean up ExternalFunction objects when module is deleted.

[Chris Hillery (ceejatec)]

review: Approve

[Luis Rodriguez Gonzalez (kuraru)]

All seems to be alright.

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1027142-process-leak-2012-07-26T22-07-34.432Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-1027142-process-leak-2012-07-26T22-07-34.432Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/com/zorba-xquery/www/modules/process.xq.src/process.cpp'
--- src/com/zorba-xquery/www/modules/process.xq.src/process.cpp	2012-01-11 18:21:38 +0000
+++ src/com/zorba-xquery/www/modules/process.xq.src/process.cpp	2012-07-21 01:14:19 +0000
@@ -525,6 +525,15 @@
 
 /******************************************************************************
  *****************************************************************************/
+ProcessModule::~ProcessModule()
+{
+  for (FuncMap_t::const_iterator lIter = theFunctions.begin();
+       lIter != theFunctions.end(); ++lIter) {
+    delete lIter->second;
+  }
+  theFunctions.clear();
+}
+
 zorba::ExternalFunction*
 ProcessModule::getExternalFunction(const zorba::String& aLocalname)
 {

=== modified file 'src/com/zorba-xquery/www/modules/process.xq.src/process.h'
--- src/com/zorba-xquery/www/modules/process.xq.src/process.h	2011-06-09 11:42:43 +0000
+++ src/com/zorba-xquery/www/modules/process.xq.src/process.h	2012-07-21 01:14:19 +0000
@@ -48,7 +48,7 @@
   FuncMap_t theFunctions;
 
 public:
-  virtual ~ProcessModule() {}
+  virtual ~ProcessModule();
 
   virtual zorba::String getURI() const
   { return "http://www.zorba-xquery.com/modules/process"; }