Bug correction EDF12462 (1)

diff --git a/src/evalyfx_swig/test1.py b/src/evalyfx_swig/test1.py
index e52a597baf0681317a56cd5487ac0cfce2fb19c4..b7bf3642389c87a1bd231d51ade03c6024454a11 100644 (file)
--- a/src/evalyfx_swig/test1.py
+++ b/src/evalyfx_swig/test1.py
@@ -24,6 +24,7 @@ fname="test1.xml"
 import evalyfx
 session=evalyfx.YACSEvalSession()
 session.launch()
+buildScheme(fname)
 efx=evalyfx.YACSEvalYFX.BuildFromFile(fname)
 efx.setParallelizeStatus(False)
 inps=efx.getFreeInputPorts()

diff --git a/src/yacsloader/parsers.cxx b/src/yacsloader/parsers.cxx
index 513dd1efc67fb2a3d09d8e9bc01e227aca132da6..3b621890b00e6946fcda57ec4104ac04875ff40d 100644 (file)
--- a/src/yacsloader/parsers.cxx
+++ b/src/yacsloader/parsers.cxx
@@ -124,6 +124,8 @@ ENGINE::Proc* YACSLoader::load(const char * file)
   {
     if ( xmlParseDocument(saxContext) == -1 )
     {
+      if(!currentProc)
+        throw Exception("Basic error during parsing.");
       YACS::ENGINE::Logger* logger = currentProc->getLogger("parser");
       logger->fatal( saxContext->lastError.message, file, saxContext->input->line );
     }
@@ -132,6 +134,8 @@ ENGINE::Proc* YACSLoader::load(const char * file)
   }
   catch(Exception& e)
   {
+    if(!currentProc)
+      throw e;
     YACS::ENGINE::Logger* logger = currentProc->getLogger("parser");
     logger->fatal(e.what(), file, saxContext->input->line);
     saxContext = 0;