Commit 754c38ee authored by Paul Selkirk's avatar Paul Selkirk
Browse files

[2832] roll back all of 946b1dfe except typo fix

parent 946b1dfe
......@@ -42,11 +42,7 @@ getSegmentTypeFromConf(const Element& conf) {
if (!conf.contains("cache-type")) {
return ("local");
}
std::string cache_type = conf.get("cache-type")->stringValue();
if ((cache_type != "local") && (cache_type != "mapped")) {
isc_throw(CacheConfigError, "invalid cache-type");
}
return (cache_type);
return (conf.get("cache-type")->stringValue());
}
}
......
......@@ -238,13 +238,6 @@ TEST_F(CacheConfigTest, getSegmentType) {
" \"params\": {}}"));
EXPECT_THROW(CacheConfig("MasterFiles", 0, *badconfig, true),
isc::data::TypeError);
// Bad value: should be rejected at construction time
ConstElementPtr badconfig2(Element::fromJSON("{\"cache-enable\": true,"
" \"cache-type\": \"bogus\","
" \"params\": {}}"));
EXPECT_THROW(CacheConfig("MasterFiles", 0, *badconfig2, true),
isc::datasrc::internal::CacheConfigError);
}
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment