Przeglądaj źródła

Merge pull request #8093 from rpastrana/HPCC-14765new-Processallimports

HPCC-14765 Handle imports correctly

Reviewed-By: Kevin Wang <kevin.wang@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 9 lat temu
rodzic
commit
3faf41d7dc
1 zmienionych plików z 1 dodań i 4 usunięć
  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"))