Commit 38fe6b32 authored by Ken Martin's avatar Ken Martin Committed by Kitware Robot
Browse files

Merge topic 'add_abort_check_xml'

13bfbcff

 fix a case where XMLDataReader errored on abort
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !4799
parents 8f88edb9 13bfbcff
......@@ -445,10 +445,13 @@ int vtkXMLDataReader::ReadPieceData()
// Read the array.
if (!this->ReadArrayForCells(eNested, cellData->GetAbstractArray(a++)))
{
vtkErrorMacro("Cannot read cell data array \""
<< cellData->GetAbstractArray(a-1)->GetName() << "\" from "
<< ePointData->GetName() << " in piece " << this->Piece
<< ". The data array in the element may be too short.");
if (!this->AbortExecute)
{
vtkErrorMacro("Cannot read cell data array \""
<< cellData->GetAbstractArray(a-1)->GetName() << "\" from "
<< ePointData->GetName() << " in piece " << this->Piece
<< ". The data array in the element may be too short.");
}
return 0;
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment