Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-08-28 12:06:32 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-08-28 12:06:32 (GMT) |
| commit | 730b88ce48471842333b8769bcfc017335b0440f (patch) | |
| tree | 3b4c2470fb5bc250d707638520348944e46fe6cf /Swiften/Entity | |
| parent | 063dc0412e0f84c779f133ec7293873b76f6b2d0 (diff) | |
| parent | 33af107d8d4ffdeada9ea964fe696af4a23c5b95 (diff) | |
| download | swift-730b88ce48471842333b8769bcfc017335b0440f.zip swift-730b88ce48471842333b8769bcfc017335b0440f.tar.bz2 | |
Merge remote branch 'origin/swift-1.x'
* swift-1.x:
Catch boost file system errors when reading VCards.
Conflicts:
Swift/Controllers/Storages/VCardFileStorage.cpp
Diffstat (limited to 'Swiften/Entity')
| -rw-r--r-- | Swiften/Entity/PayloadPersister.cpp | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/Swiften/Entity/PayloadPersister.cpp b/Swiften/Entity/PayloadPersister.cpp index 955135b..729d36a 100644 --- a/Swiften/Entity/PayloadPersister.cpp +++ b/Swiften/Entity/PayloadPersister.cpp @@ -25,29 +25,32 @@ PayloadPersister::~PayloadPersister() { } void PayloadPersister::savePayload(boost::shared_ptr<Payload> payload, const boost::filesystem::path& path) { - if (!boost::filesystem::exists(path.parent_path())) { - try { + try { + if (!boost::filesystem::exists(path.parent_path())) { boost::filesystem::create_directories(path.parent_path()); } - catch (const boost::filesystem::filesystem_error& e) { - std::cerr << "ERROR: " << e.what() << std::endl; - } + boost::filesystem::ofstream file(path); + file << getSerializer()->serialize(payload); + file.close(); + } + catch (const boost::filesystem::filesystem_error& e) { + std::cerr << "ERROR: " << e.what() << std::endl; } - boost::filesystem::ofstream file(path); - file << getSerializer()->serialize(payload); - file.close(); } boost::shared_ptr<Payload> PayloadPersister::loadPayload(const boost::filesystem::path& path) { - if (boost::filesystem::exists(path)) { - ByteArray data; - readByteArrayFromFile(data, path.string()); - boost::shared_ptr<PayloadParser> parser(createParser()); - PayloadParserTester tester(parser.get()); - tester.parse(byteArrayToString(data)); - return parser->getPayload(); + try { + if (boost::filesystem::exists(path)) { + ByteArray data; + readByteArrayFromFile(data, path.string()); + boost::shared_ptr<PayloadParser> parser(createParser()); + PayloadParserTester tester(parser.get()); + tester.parse(byteArrayToString(data)); + return parser->getPayload(); + } } - else { - return boost::shared_ptr<Payload>(); + catch (const boost::filesystem::filesystem_error& e) { + std::cerr << "ERROR: " << e.what() << std::endl; } + return boost::shared_ptr<Payload>(); } |