Skip to content

Fix issue #374 showing wrong type in error manager for mutlirecordengine #437

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
helgesson wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix issue #374 showing wrong type in error manager for mutlirecordengine #437

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions FileHelpers/MultiRecord/MultiRecordEngine.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,17 +174,15 @@ public object[] ReadStream(IRecordReader reader)
{
mReader = freader
};

while (currentLine != null)
{
Type currentType = null;
try
{
mTotalRecords++;
currentRecord++;

line.ReLoad(currentLine);

Type currentType;
try
{
currentType = mRecordSelector(this, currentLine);
Expand Down Expand Up @@ -225,7 +223,7 @@ public object[] ReadStream(IRecordReader reader)
mLineNumber = freader.LineNumber,
mExceptionInfo = ex,
mRecordString = completeLine,
mRecordTypeName = RecordInfo.RecordType.Name
mRecordTypeName = currentType?.Name
};

mErrorManager.AddError(err);
Expand Down Expand Up @@ -577,25 +575,26 @@ private void ReadNextRecord()
{
mReader = mAsyncReader
};

while (true)
{
Type currentType = null;
if (currentLine != null)
{
try
{
mTotalRecords++;

Type currType = mRecordSelector(this, currentLine);
currentType = mRecordSelector(this, currentLine);

line.ReLoad(currentLine);

if (currType != null)
if (currentType != null)
{
mRecordInfoTable.TryGetValue(currType, out IRecordInfo info);
mRecordInfoTable.TryGetValue(currentType, out IRecordInfo info);
if (info == null)
{
throw new BadUsageException("A record is of type '" + currType.Name +
throw new BadUsageException("A record is of type '" + currentType.Name +
"' which this engine is not configured to handle. Try adding this type to the constructor.");
}

Expand All @@ -622,7 +621,7 @@ private void ReadNextRecord()
mLineNumber = mAsyncReader.LineNumber,
mExceptionInfo = ex,
mRecordString = currentLine,
mRecordTypeName = RecordInfo.RecordType.Name
mRecordTypeName = currentType?.Name
};

mErrorManager.AddError(err);
Expand Down