BIND 10 trac2850_2, updated. 85873bf8615dc643db8619414e417dffef827c4f [2850] simplification: instantiate ZoneWriter directly.
BIND 10 source code commits
bind10-changes at lists.isc.org
Wed May 1 21:27:31 UTC 2013
The branch, trac2850_2 has been updated
via 85873bf8615dc643db8619414e417dffef827c4f (commit)
from 909a05ac4185589eb2304d815b5ccd108f92f4b7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 85873bf8615dc643db8619414e417dffef827c4f
Author: JINMEI Tatuya <jinmei at isc.org>
Date: Wed May 1 14:27:05 2013 -0700
[2850] simplification: instantiate ZoneWriter directly.
-----------------------------------------------------------------------
Summary of changes:
src/lib/datasrc/client_list.cc | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/client_list.cc b/src/lib/datasrc/client_list.cc
index c9bdee0..94aee85 100644
--- a/src/lib/datasrc/client_list.cc
+++ b/src/lib/datasrc/client_list.cc
@@ -153,13 +153,13 @@ ConfigurableClientList::configure(const ConstElementPtr& config,
<< zname << "/" << rrclass_);
}
assert(load_action); // in this loop this should be always true
- boost::scoped_ptr<memory::ZoneWriter> writer;
try {
- writer.reset(new_data_sources.back().ztable_segment_->
- getZoneWriter(load_action, zname, rrclass_));
- writer->load();
- writer->install();
- writer->cleanup();
+ memory::ZoneWriter writer(
+ new_data_sources.back().ztable_segment_.get(),
+ load_action, zname, rrclass_);
+ writer.load();
+ writer.install();
+ writer.cleanup();
} catch (const ZoneLoaderException& e) {
LOG_ERROR(logger, DATASRC_LOAD_ZONE_ERROR)
.arg(zname).arg(rrclass_).arg(name).arg(e.what());
@@ -348,8 +348,9 @@ ConfigurableClientList::getCachedZoneWriter(const Name& name) {
}
return (ZoneWriterPair(ZONE_SUCCESS,
ZoneWriterPtr(
- result.info->ztable_segment_->
- getZoneWriter(load_action, name, rrclass_))));
+ new memory::ZoneWriter(
+ result.info->ztable_segment_.get(),
+ load_action, name, rrclass_))));
}
// NOTE: This function is not tested, it would be complicated. However, the
More information about the bind10-changes
mailing list