diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2008-04-27 02:22:14 +0000 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2008-04-27 02:22:14 +0000 |
| commit | 1ef99931e131343f069a4b74edfc06196d72d85b (patch) | |
| tree | d640f061a66a193d5f4d92b61836161208ccff14 /src/DefaultExtensionMessageFactory.cc | |
| parent | a7952cce05a41c6e20d6eddc569a8bffe974aade (diff) | |
2008-04-27 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
Rewritten Exception class. Throw exception object, not its pointer and
catch by reference, so that remove problematic delete operator for
catched exception.
* src/Exception.cc
* src/Exception.h
* test/ExceptionTest.cc
* src/*: All files throwing/catching exception.
* test/*: All files throwing/catching exception.
Diffstat (limited to 'src/DefaultExtensionMessageFactory.cc')
| -rw-r--r-- | src/DefaultExtensionMessageFactory.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/DefaultExtensionMessageFactory.cc b/src/DefaultExtensionMessageFactory.cc index 4b580fb4..2295a70e 100644 --- a/src/DefaultExtensionMessageFactory.cc +++ b/src/DefaultExtensionMessageFactory.cc @@ -41,6 +41,7 @@ #include "LogFactory.h" #include "Logger.h" #include "BtRegistry.h" +#include "StringFormat.h" namespace aria2 { @@ -68,8 +69,9 @@ DefaultExtensionMessageFactory::createMessage(const unsigned char* data, size_t } else { std::string extensionName = getExtensionName(extensionMessageID); if(extensionName.empty()) { - throw new DlAbortEx("No extension registered for extended message ID %u", - extensionMessageID); + throw DlAbortEx + (StringFormat("No extension registered for extended message ID %u", + extensionMessageID).str()); } if(extensionName == "ut_pex") { // uTorrent compatible Peer-Exchange @@ -78,7 +80,9 @@ DefaultExtensionMessageFactory::createMessage(const unsigned char* data, size_t m->setBtContext(_btContext); return m; } else { - throw new DlAbortEx("Unsupported extension message received. extensionMessageID=%u, extensionName=%s", extensionMessageID, extensionName.c_str()); + throw DlAbortEx + (StringFormat("Unsupported extension message received. extensionMessageID=%u, extensionName=%s", + extensionMessageID, extensionName.c_str()).str()); } } } |
