← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/module/registry.cc

  • Committer: Andrew Hutchings
  • Date: 2011-02-07 17:20:59 UTC
  • mfrom: (2148 staging)
  • mto: (2148.2.3 build)
  • mto: This revision was merged to the branch mainline in revision 2149.
  • Revision ID: andrew@linuxjedi.co.uk-20110207172059-dyeahrgzrlincoe3
Merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/module/registry.cc
64
64
    ++plugin_iter;
65
65
  }
66
66
 
 
67
  plugin::Plugin::vector error_plugins;
67
68
  plugin_iter= plugin_registry.begin();
68
69
  while (plugin_iter != plugin_registry.end())
69
70
  {
70
 
    delete (*plugin_iter).second;
 
71
    if ((*plugin_iter).second->removeLast())
 
72
    {
 
73
      error_plugins.push_back((*plugin_iter).second);
 
74
    }
 
75
    else
 
76
    {
 
77
      delete (*plugin_iter).second;
 
78
    }
71
79
    ++plugin_iter;
72
80
  }
 
81
 
 
82
  for (plugin::Plugin::vector::iterator iter= error_plugins.begin();
 
83
       iter != error_plugins.end(); iter++)
 
84
  {
 
85
    delete *iter;
 
86
  }
 
87
 
73
88
  plugin_registry.clear();
74
89
 
75
90
#if 0