← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/plugin/registry.cc

  • Committer: Siddharth Prakash Singh
  • Date: 2010-03-26 19:25:23 UTC
  • mfrom: (1410 drizzle)
  • mto: This revision was merged to the branch mainline in revision 1425.
  • Revision ID: spsneo@spsneo-laptop-20100326192523-ibjlbt1p692vobtj
merging with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/plugin/registry.cc
37
37
 
38
38
plugin::Registry::~Registry()
39
39
{
40
 
  map<string, plugin::Library *>::iterator iter= library_map.begin();
41
 
  while (iter != library_map.end())
42
 
  {
43
 
    delete (*iter).second;
44
 
    ++iter;
 
40
  map<string, plugin::Plugin *>::iterator plugin_iter= plugin_registry.begin();
 
41
  while (plugin_iter != plugin_registry.end())
 
42
  {
 
43
    delete (*plugin_iter).second;
 
44
    ++plugin_iter;
 
45
  }
 
46
  plugin_registry.clear();
 
47
 
 
48
  /*
 
49
    @TODO When we delete modules here, we segfault on a bad string. Why?
 
50
    map<string, plugin::Module *>::iterator module_iter= module_map.begin();
 
51
  while (module_iter != module_map.end())
 
52
  {
 
53
    delete (*module_iter).second;
 
54
    ++module_iter;
 
55
  }
 
56
  module_map.clear();
 
57
  */
 
58
  map<string, plugin::Library *>::iterator library_iter= library_map.begin();
 
59
  while (library_iter != library_map.end())
 
60
  {
 
61
    delete (*library_iter).second;
 
62
    ++library_iter;
45
63
  }
46
64
  library_map.clear();
47
65
}