Merge branch 'master' of ssh://git.fedorahosted.org/git/abrt

2 files changed, 7 insertions, 7 deletions

diff --git a/src/Daemon/Daemon.cpp b/src/Daemon/Daemon.cpp
index 5bcbe232..185ff7f0 100644
--- a/src/Daemon/Daemon.cpp
+++ b/src/Daemon/Daemon.cpp
@@ -294,7 +294,7 @@ static void FindNewDumps(const char* pPath)
     struct stat stats;
     DIR *dp;
     vector_string_t dirs;
-    // get potential unsaved debugdumps
+    /* Get all debugdump directories in the pPath directory. */
     dp = opendir(pPath);
     if (dp == NULL)
     {
@@ -305,7 +305,7 @@ static void FindNewDumps(const char* pPath)
     while ((ep = readdir(dp)))
     {
         if (dot_or_dotdot(ep->d_name))
-            continue;
+            continue; /* skip "." and ".." */
         std::string dname = ssprintf("%s/%s", pPath, ep->d_name);
         if (lstat(dname.c_str(), &stats) == 0)
         {
@@ -317,6 +317,7 @@ static void FindNewDumps(const char* pPath)
     }
     closedir(dp);
 
+    // get potential unsaved debugdumps
     vector_string_t::iterator itt = dirs.begin();
     for (; itt != dirs.end(); ++itt)
     {
diff --git a/src/Daemon/PluginManager.cpp b/src/Daemon/PluginManager.cpp
index c552880c..15e9bee8 100644
--- a/src/Daemon/PluginManager.cpp
+++ b/src/Daemon/PluginManager.cpp
@@ -159,16 +159,15 @@ void CPluginManager::UnLoadPlugins()
 
 CPlugin* CPluginManager::LoadPlugin(const char *pName, bool enabled_only)
 {
-    map_string_t plugin_info;
-
-    plugin_info["Name"] = pName;
-
     map_plugin_t::iterator it_plugin = m_mapPlugins.find(pName);
     if (it_plugin != m_mapPlugins.end())
     {
         return it_plugin->second; /* ok */
     }
 
+    map_string_t plugin_info;
+    plugin_info["Name"] = pName;
+
     const char *conf_name = pName;
     if (strncmp(pName, "Kerneloops", sizeof("Kerneloops")-1) == 0)
     {
@@ -262,8 +261,8 @@ void CPluginManager::UnLoadPlugin(const char *pName)
             m_mapPlugins.erase(it_plugin);
         }
         log("UnRegistered %s plugin %s", plugin_type_str[it_module->second->GetType()], pName);
-        m_mapLoadedModules.erase(it_module);
         delete it_module->second;
+        m_mapLoadedModules.erase(it_module);
     }
 }