Merge lp:~paul-lucas/zorba/bug-944797 into lp:zorba

[Paul J. Lucas]

Added ~XmlNodeTokenizerCallback() to destroy tokenizers.

Added ~XmlNodeTokenizerCallback() to destroy tokenizers.

[Paul J. Lucas (paul-lucas)]

review: Approve

[Matthias Brantner (matthias-brantner)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-944797-2012-03-02T16-19-10.915Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-944797-2012-03-02T16-19-10.915Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/store/naive/node_items.cpp'
--- src/store/naive/node_items.cpp	2012-02-28 20:45:43 +0000
+++ src/store/naive/node_items.cpp	2012-03-02 13:52:59 +0000
@@ -43,6 +43,7 @@
 #include "dataguide.h"
 #include "node_factory.h"
 
+#include "util/stl_util.h"
 #include "util/string_util.h"
 
 #ifndef ZORBA_NO_FULL_TEXT
@@ -4638,6 +4639,13 @@
 }
 
 
+XmlNodeTokenizerCallback::~XmlNodeTokenizerCallback()
+{
+  while ( !tokenizer_stack_.empty() )
+    ztd::pop_stack( tokenizer_stack_ )->destroy();
+}
+
+
 inline XmlNodeTokenizerCallback::begin_type
 XmlNodeTokenizerCallback::beginTokenization() const 
 {

=== modified file 'src/store/naive/node_items.h'
--- src/store/naive/node_items.h	2012-02-28 20:45:43 +0000
+++ src/store/naive/node_items.h	2012-03-02 13:52:59 +0000
@@ -1666,6 +1666,8 @@
                             locale::iso639_1::type lang,
                             container_type &tokens );
 
+  ~XmlNodeTokenizerCallback();
+
   begin_type beginTokenization() const;
 
   void endTokenization( XmlNode const*, begin_type );