Code cleanup

src/TrackerWatcherCommand.cc

@@ -112,12 +112,12 @@ bool TrackerWatcherCommand::execute() {
         A2_LOG_ERROR_EX(EX_EXCEPTION_CAUGHT, ex);
       }
     }
-  } else if(trackerRequestGroup_->getNumCommand() == 0 &&
-            trackerRequestGroup_->downloadFinished()){
+  } else if(trackerRequestGroup_->getNumCommand() == 0) {
     // We really want to make sure that tracker request has finished
     // by checking getNumCommand() == 0. Because we reset
     // trackerRequestGroup_, if it is still used in other Command, we
     // will get Segmentation fault.
+    if(trackerRequestGroup_->downloadFinished()) {
       try {
         std::string trackerResponse = getTrackerResponse(trackerRequestGroup_);
 
@@ -132,7 +132,7 @@ bool TrackerWatcherCommand::execute() {
         }
       }
       trackerRequestGroup_.reset();
-  } else if(trackerRequestGroup_->getNumCommand() == 0){
+    } else {
       // handle errors here
       btAnnounce_->announceFailure(); // inside it, trackers = 0.
       trackerRequestGroup_.reset();
@@ -140,6 +140,7 @@ bool TrackerWatcherCommand::execute() {
         btAnnounce_->resetAnnounce();
       }
     }
+  }
   e_->addCommand(this);
   return false;
 }