Просмотр исходного кода

HPCC-14765 Handle imports correctly

- No longer attempts to load imported files, when processing
  esdl xml from buffer

Signed-off-by: rpastrana <rodrigo.pastrana@lexisnexis.com>
rpastrana 9 лет назад
Родитель
Сommit
a21a5e1414
1 измененных файлов с 1 добавлено и 4 удалено
  1. 1 4
      esp/esdllib/esdl_def.cpp

+ 1 - 4
esp/esdllib/esdl_def.cpp

@@ -1862,12 +1862,9 @@ public:
                             if(type == XmlPullParser::START_TAG)
                             {
                                 xpp->readStartTag(stag);
+                                //we're loading from buffer, no need to load includes from file
                                 if(!stricmp(stag.getLocalName(), "EsdlInclude"))
-                                {
-                                    const char *incname = stag.getValue("file");
-                                    loadfile(path, incname, indent+3);
                                     xpp->skipSubTree();
-                                }
                                 else if(!stricmp(stag.getLocalName(), "EsdlStruct"))
                                     loadStruct(xpp.get(), stag, EsdlTypeStruct);
                                 else if(!stricmp(stag.getLocalName(), "EsdlRequest"))