diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2010-06-20 11:37:47 +0000 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2010-06-20 11:37:47 +0000 |
| commit | 0f0fc5f1987e879ddfffdb0de9214987157eedc2 (patch) | |
| tree | d822459d452f3e7f1d7f49df867363eb01023be5 /src/AbstractCommand.cc | |
| parent | cb4e25e4b4a2cfa6349a25586a44c932022e6841 (diff) | |
2010-06-20 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Use auto_delete_container to delete created Command when exception
is thrown rather than deleting them in catch block.
* src/AbstractCommand.cc
* src/CheckIntegrityCommand.cc
* src/DHTSetup.cc
* src/FileAllocationCommand.cc
* src/TrackerWatcherCommand.cc
* src/a2functional.h
Diffstat (limited to 'src/AbstractCommand.cc')
| -rw-r--r-- | src/AbstractCommand.cc | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/AbstractCommand.cc b/src/AbstractCommand.cc index 03fa6476..e8bd53c3 100644 --- a/src/AbstractCommand.cc +++ b/src/AbstractCommand.cc @@ -722,14 +722,11 @@ void AbstractCommand::prepareForNextAction(Command* nextCommand) SharedHandle<CheckIntegrityEntry> entry (new StreamCheckIntegrityEntry(_requestGroup, nextCommand)); - std::vector<Command*> commands; - try { - _requestGroup->processCheckIntegrityEntry(commands, entry, _e); - } catch(RecoverableException& e) { - std::for_each(commands.begin(), commands.end(), Deleter()); - throw; - } - _e->addCommand(commands); + std::vector<Command*>* commands = new std::vector<Command*>(); + auto_delete_container<std::vector<Command*> > commandsDel(commands); + _requestGroup->processCheckIntegrityEntry(*commands, entry, _e); + _e->addCommand(*commands); + commands->clear(); _e->setNoWait(true); } |