Skip to content

Commit 630b6e8

Browse files
author
terrypacker
committed
Fixing deleted email users, as per issue
MangoAutomation/ma-core-public#645
1 parent 8844c54 commit 630b6e8

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

Reports/RELEASE-NOTES

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
*Version 2.2.2*
22
* Fixed help dialogue linking.
3+
* Fixing bug where deleted users linked to a report template's email functionality would break the report
4+
35

46
*Version 2.2.1*
57
* Limited view of Users available for emailing a report. User must have 1 common group to report creator.

Reports/src/com/serotonin/m2m2/reports/vo/ReportVO.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -523,6 +523,7 @@ private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundE
523523
scheduleCron = SerializationHelper.readSafeUTF(in);
524524
email = in.readBoolean();
525525
recipients = (List<RecipientListEntryBean>) in.readObject();
526+
RecipientListEntryBean.cleanRecipientList(recipients);
526527
includeData = in.readBoolean();
527528
zipData = in.readBoolean();
528529
}
@@ -559,6 +560,7 @@ else if (ver == 2) {
559560
scheduleCron = SerializationHelper.readSafeUTF(in);
560561
email = in.readBoolean();
561562
recipients = (List<RecipientListEntryBean>) in.readObject();
563+
RecipientListEntryBean.cleanRecipientList(recipients);
562564
includeData = in.readBoolean();
563565
zipData = in.readBoolean();
564566
}

0 commit comments

Comments
 (0)