Do _components.reset at the end.

1 files changed, 5 insertions, 11 deletions

diff --git a/filedistribution/src/apps/filedistributor/filedistributor.cpp b/filedistribution/src/apps/filedistributor/filedistributor.cpp
index 49be72ca7fe..0c89fb08b6b 100644
--- a/filedistribution/src/apps/filedistributor/filedistributor.cpp
+++ b/filedistribution/src/apps/filedistributor/filedistributor.cpp
@@ -204,12 +204,7 @@ public:
         downloader.setMaxUploadSpeed(config.maxuploadspeed);
     }
 
-    //avoid warning due to scope exit macro
-#pragma GCC diagnostic ignored "-Wshadow"
     void runImpl(const config::ConfigUri & configUri) {
-
-        _components.reset();
-
         createComponents(configUri);
 
         // We do not want back to back reinitializing as it gives zero time for serving
@@ -218,16 +213,15 @@ public:
 
         while (!askedToShutDown() &&
 	       (postPoneAskedToReinitializedSecs > 0 || !askedToReinitialize()) &&
-	       !completeReconfigurationNeeded()) {
-	  postPoneAskedToReinitializedSecs--;
-	  std::this_thread::sleep_for(1s);
+	       !completeReconfigurationNeeded())
+        {
+	    postPoneAskedToReinitializedSecs--;
+	    std::this_thread::sleep_for(1s);
         }
+        _components.reset();
     }
 };
 
-//TODO: use pop in gcc 4.6
-#pragma GCC diagnostic warning "-Wshadow"
-
 class FileDistributorApplication : public FastOS_Application {
     const config::ConfigUri _configUri;
 public: