Commit 89dad444 authored by Jelte Jansen's avatar Jelte Jansen

fixed some leftover ParseErrors


git-svn-id: svn://bind10.isc.org/svn/bind10/branches/trac172@2115 e5f2f494-b856-4b98-b285-d166d9295462
parent c5dd3881
......@@ -47,7 +47,7 @@ using namespace std;
using isc::data::Element;
using isc::data::ElementPtr;
using isc::data::ParseError;
using isc::data::JSONError;
namespace isc {
namespace config {
......@@ -175,7 +175,7 @@ ModuleCCSession::readModuleSpecification(const std::string& filename) {
try {
module_spec = moduleSpecFromFile(file, true);
} catch (ParseError pe) {
} catch (JSONError pe) {
cout << "Error parsing module specification file: " << pe.what() << endl;
exit(1);
} catch (ModuleSpecError dde) {
......
......@@ -231,7 +231,7 @@ ModuleSpec::validate_config(const ElementPtr data, const bool full, ElementPtr e
ModuleSpec
moduleSpecFromFile(const std::string& file_name, const bool check)
throw(ParseError, ModuleSpecError)
throw(JSONError, ModuleSpecError)
{
std::ifstream file;
......@@ -252,7 +252,7 @@ moduleSpecFromFile(const std::string& file_name, const bool check)
ModuleSpec
moduleSpecFromFile(std::ifstream& in, const bool check)
throw(ParseError, ModuleSpecError) {
throw(JSONError, ModuleSpecError) {
ElementPtr module_spec_element = Element::fromJSON(in);
if (module_spec_element->contains("module_spec")) {
return ModuleSpec(module_spec_element->get("module_spec"), check);
......
......@@ -110,7 +110,7 @@ namespace isc { namespace config {
/// is checked to be of the correct form
ModuleSpec
moduleSpecFromFile(const std::string& file_name, const bool check = true)
throw(ParseError, ModuleSpecError);
throw(JSONError, ModuleSpecError);
/// Creates a \c ModuleSpec instance from the given input
/// stream that contains the contents of a .spec file.
......@@ -122,7 +122,7 @@ namespace isc { namespace config {
/// to be of the correct form
ModuleSpec
moduleSpecFromFile(std::ifstream& in, const bool check = true)
throw(ParseError, ModuleSpecError);
throw(JSONError, ModuleSpecError);
} }
#endif // _DATA_DEF_H
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