summaryrefslogtreecommitdiff
path: root/src/MultiDiskAdaptor.cc
diff options
context:
space:
mode:
authorTatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>2011-12-25 23:38:36 +0900
committerTatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>2011-12-25 23:38:36 +0900
commit52155b1860765c63a9a335f0467870ae4cc7a4d0 (patch)
tree93e6782324f5fc2de2a3dd8c4da3bf45082f3f7e /src/MultiDiskAdaptor.cc
parent8865001f0112840d0f4cf370e55df26ff036cca3 (diff)
No retry for close() with EINTR. Also reverted changes in d5ffa253.
Diffstat (limited to 'src/MultiDiskAdaptor.cc')
-rw-r--r--src/MultiDiskAdaptor.cc16
1 files changed, 2 insertions, 14 deletions
diff --git a/src/MultiDiskAdaptor.cc b/src/MultiDiskAdaptor.cc
index 3cb464ff..17f3198d 100644
--- a/src/MultiDiskAdaptor.cc
+++ b/src/MultiDiskAdaptor.cc
@@ -297,20 +297,8 @@ void MultiDiskAdaptor::openExistingFile()
void MultiDiskAdaptor::closeFile()
{
- bool ok = true;
- for(std::vector<SharedHandle<DiskWriterEntry> >::const_iterator i =
- diskWriterEntries_.begin(), eoi = diskWriterEntries_.end(); i != eoi;
- ++i) {
- try {
- (*i)->closeFile();
- } catch(RecoverableException& e) {
- A2_LOG_ERROR_EX(EX_EXCEPTION_CAUGHT, e);
- ok = false;
- }
- }
- if(!ok) {
- throw DL_ABORT_EX("Failed to close some files");
- }
+ std::for_each(diskWriterEntries_.begin(), diskWriterEntries_.end(),
+ mem_fun_sh(&DiskWriterEntry::closeFile));
}
namespace {