Skip to content

Commit accb963

Browse files
Merge pull request #1040 from solidify/bugfix/null-check-on-wi-dates
Bugfix/null check on wi dates
2 parents 589c4ab + a8daabe commit accb963

File tree

2 files changed

+18
-3
lines changed

2 files changed

+18
-3
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -335,3 +335,6 @@ About
335335

336336
# Visual Code
337337
**/.ionide
338+
339+
# Testing scripts
340+
*.ps1

src/WorkItemMigrator/WorkItemImport/WitClient/WitClientUtils.cs

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -797,7 +797,11 @@ public string EncodeFileNameUsingJiraStandard(string fileName)
797797

798798
private void CorrectClosedByAndClosedDate(WiRevision rev, WorkItem wi)
799799
{
800-
var wiState = wi.Fields[WiFieldReference.State].ToString() ?? string.Empty;
800+
var wiState = string.Empty;
801+
if (wi.Fields.ContainsKey(WiFieldReference.State))
802+
{
803+
wiState = wi.Fields[WiFieldReference.State].ToString();
804+
}
801805
var revState = rev.Fields.GetFieldValueOrDefault<string>(WiFieldReference.State) ?? string.Empty;
802806

803807
if (
@@ -827,7 +831,11 @@ private void CorrectClosedByAndClosedDate(WiRevision rev, WorkItem wi)
827831
}
828832
private void CorrectActivatedByAndActivatedDate(WiRevision rev, WorkItem wi)
829833
{
830-
var wiState = wi.Fields[WiFieldReference.State].ToString() ?? string.Empty;
834+
var wiState = string.Empty;
835+
if (wi.Fields.ContainsKey(WiFieldReference.State))
836+
{
837+
wiState = wi.Fields[WiFieldReference.State].ToString();
838+
}
831839
var revState = rev.Fields.GetFieldValueOrDefault<string>(WiFieldReference.State) ?? string.Empty;
832840

833841
if (!wiState.Equals(New, StringComparison.InvariantCultureIgnoreCase) && revState.Equals(New, StringComparison.InvariantCultureIgnoreCase))
@@ -848,7 +856,11 @@ private void CorrectActivatedByAndActivatedDate(WiRevision rev, WorkItem wi)
848856

849857
private void CorrectResolvedByAndResolvedDate(WiRevision rev, WorkItem wi)
850858
{
851-
var wiState = wi.Fields[WiFieldReference.State].ToString() ?? string.Empty;
859+
var wiState = string.Empty;
860+
if (wi.Fields.ContainsKey(WiFieldReference.State))
861+
{
862+
wiState = wi.Fields[WiFieldReference.State].ToString();
863+
}
852864
var revState = rev.Fields.GetFieldValueOrDefault<string>(WiFieldReference.State) ?? string.Empty;
853865

854866
if ((wiState.Equals(Resolved, StringComparison.InvariantCultureIgnoreCase)

0 commit comments

Comments
 (0)