OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-08 07:03:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

#1665 Handle end of file without error when parsing command file

Browse Source
This commit is contained in:
Bjørnar Grip Fjær 2017-07-27 15:43:57 +02:00
parent d0564c4d2a
commit 865238bc71
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/CommandFileInterface/Core/RifcCommandFileReader.cpp
View File

@ -69,6 +69,12 @@ std::vector<RicfCommandObject*> RicfCommandFileReader::readCommands(QTextStream&
}
}
if (commandName.isEmpty() && inputStream.atEnd())
{
// Read past the last command
break;
}
CAF_ASSERT(objectFactory);
caf::PdmObjectHandle* obj = objectFactory->create(commandName);
RicfCommandObject* cObj = dynamic_cast<RicfCommandObject*>(obj);

5
ApplicationCode/CommandFileInterface/RicfCommandFileExecutor.cpp
View File

@ -59,11 +59,12 @@ void RicfCommandFileExecutor::executeCommands(QTextStream& stream)
{
if (message.first == RicfMessages::MESSAGE_WARNING)
{
RiaLogging::warning(message.second);
RiaLogging::warning(QString("Command file parsing warning: %1").arg(message.second));
}
else
{
RiaLogging::error(message.second);
RiaLogging::error(QString("Command file parsing error: %1").arg(message.second));
return;
}
}
for (RicfCommandObject* command : commands)