From ffd4da24e61917f21c5ba0b1112e8954c6e5bfeb Mon Sep 17 00:00:00 2001
From: Benoit Foucher <benoit@zeroc.com>
Date: Thu, 9 Jan 2003 23:58:55 +0000
Subject: Fix to display correct error message if imported file isn't found.

---
 cpp/src/XMLTransform/XMLTransform.cpp | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

(limited to 'cpp/src/XMLTransform/XMLTransform.cpp')

diff --git a/cpp/src/XMLTransform/XMLTransform.cpp b/cpp/src/XMLTransform/XMLTransform.cpp
index 9997baed84c..bf6bf03ef3e 100644
--- a/cpp/src/XMLTransform/XMLTransform.cpp
+++ b/cpp/src/XMLTransform/XMLTransform.cpp
@@ -1758,27 +1758,29 @@ XMLTransform::TransformFactory::import(DocumentMap& documents, set<string>& impo
     //
     string file = findFile(loc, paths);
 
-    ArrayJanitor<XMLCh> s(XMLString::transcode(file.c_str()));
-    LocalFileInputSource source(s.get());
-
-    string systemId = toString(source.getSystemId());
-
-    if(importedFiles.find(systemId) != importedFiles.end())
-    {
-	//
-	// Already imported, nothing to do.
-	//
-	return;
-    }
-
     DOMTreeErrorReporter errorReporter;
     XercesDOMParser parser;
     parser.setValidationScheme(AbstractDOMParser::Val_Never);
     parser.setDoNamespaces(true);
     parser.setErrorHandler(&errorReporter);
 
+    string systemId;
+
     try
     {
+	ArrayJanitor<XMLCh> s(XMLString::transcode(file.c_str()));
+	LocalFileInputSource source(s.get());
+
+	systemId = toString(source.getSystemId());
+
+	if(importedFiles.find(systemId) != importedFiles.end())
+	{
+	    //
+	    // Already imported, nothing to do.
+	    //
+	    return;
+	}
+
         parser.parse(source);
     }
     catch(const XMLException& ex)
-- 
cgit v1.2.3