Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ISC Open Source Projects
Kea
Commits
27033b59
Commit
27033b59
authored
Dec 07, 2012
by
Michal 'vorner' Vaner
Browse files
[2378] Simplify the loadIncremental code
Some of the code can be shared between the variants, saving some code.
parent
af1da46e
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/lib/datasrc/zone_loader.cc
View file @
27033b59
...
...
@@ -110,26 +110,18 @@ ZoneLoader::loadIncremental(size_t limit) {
if
(
iterator_
==
ZoneIteratorPtr
())
{
assert
(
loader_
.
get
()
!=
NULL
);
if
(
loader_
->
loadIncremental
(
limit
))
{
complete_
=
true
;
if
(
!
loaded_ok_
)
{
isc_throw
(
MasterFileError
,
"Error while loading master file"
);
}
else
{
updater_
->
commit
();
}
return
(
true
);
}
else
{
return
(
false
);
complete_
=
loader_
->
loadIncremental
(
limit
);
if
(
complete_
&&
!
loaded_ok_
)
{
isc_throw
(
MasterFileError
,
"Error while loading master file"
);
}
}
else
{
if
(
copyRRsets
(
updater_
,
iterator_
,
limit
))
{
updater_
->
commit
();
complete_
=
true
;
return
(
true
);
}
else
{
return
(
false
);
}
complete_
=
copyRRsets
(
updater_
,
iterator_
,
limit
);
}
if
(
complete_
)
{
updater_
->
commit
();
}
return
(
complete_
);
}
}
// end namespace datasrc
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment