Correct file existing checking.

The file existence checking is not to be done in GUrlFile as this class may create a new file. The check needs to be done in GXml.

Correct file existing checking.
The file existence checking is not to be done in GUrlFile as this class may create a new file. The check needs to be done in GXml.
Jürgen Knödlseder
1 parent 7b96c7eb
Showing 2 changed files with 9 additions and 6 deletions
src/support/GUrlFile.cpp
src/xml/GXml.cpp
@@ -211,11 +211,6 @@ void GUrlFile::open(const std::string&amp; url, const std::string&amp; mode)
     // Expand environment variables
     std::string filename = gammalib::expand_env(url);
  
-    // Check if file exists
-    if (!gammalib::file_exists(filename)) {
-        throw GException::file_open_error(G_OPEN, filename);
-    }
-
     // Try opening file. Throw an exception if opening failed.
     m_fptr = std::fopen(filename.c_str(), mode.c_str());
     if (m_fptr == NULL) {
@@ -517,8 +517,16 @@ const GXmlElement* GXml::element(const std::string&amp; name, const int&amp; index) cons
  ***************************************************************************/
 void GXml::load(const std::string& filename)
 {
+    // Expand environment variables
+    std::string fname = gammalib::expand_env(filename);
+
+    // Check if file exists
+    if (!gammalib::file_exists(fname)) {
+        throw GException::file_open_error(G_LOAD, fname);
+    }
+
     // Open XML URL as file for reading
-    GUrlFile url(filename.c_str(), "r");
+    GUrlFile url(fname.c_str(), "r");
  
     // Read XML document from URL
     read(url);