[svn] commit: r2115 - in /branches/trac172/src/lib/config: ccsession.cc module_spec.cc module_spec.h

[BIND 10 source code commits]

Author: jelte
Date: Tue Jun 15 13:41:01 2010
New Revision: 2115

Log:
fixed some leftover ParseErrors

Modified:
    branches/trac172/src/lib/config/ccsession.cc
    branches/trac172/src/lib/config/module_spec.cc
    branches/trac172/src/lib/config/module_spec.h

Modified: branches/trac172/src/lib/config/ccsession.cc
==============================================================================
--- branches/trac172/src/lib/config/ccsession.cc (original)
+++ branches/trac172/src/lib/config/ccsession.cc Tue Jun 15 13:41:01 2010
@@ -47,7 +47,7 @@
 
 using isc::data::Element;
 using isc::data::ElementPtr;
-using isc::data::ParseError;
+using isc::data::JSONError;
 
 namespace isc {
 namespace config {
@@ -175,7 +175,7 @@
 
     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) {

Modified: branches/trac172/src/lib/config/module_spec.cc
==============================================================================
--- branches/trac172/src/lib/config/module_spec.cc (original)
+++ branches/trac172/src/lib/config/module_spec.cc Tue Jun 15 13:41:01 2010
@@ -231,7 +231,7 @@
 
 ModuleSpec
 moduleSpecFromFile(const std::string& file_name, const bool check)
-                   throw(ParseError, ModuleSpecError)
+                   throw(JSONError, ModuleSpecError)
 {
     std::ifstream file;
 
@@ -252,7 +252,7 @@
 
 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);

Modified: branches/trac172/src/lib/config/module_spec.h
==============================================================================
--- branches/trac172/src/lib/config/module_spec.h (original)
+++ branches/trac172/src/lib/config/module_spec.h Tue Jun 15 13:41:01 2010
@@ -110,7 +110,7 @@
     /// 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 @@
     /// 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