Fixing deleted email users, as per issue

MangoAutomation/ma-core-public#645
MangoAutomation · Feb 17, 2016 · 630b6e8 · 630b6e8
1 parent 8844c54
commit 630b6e8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/Reports/RELEASE-NOTES b/Reports/RELEASE-NOTES
@@ -1,5 +1,7 @@
 *Version 2.2.2*
 * Fixed help dialogue linking.
+* Fixing bug where deleted users linked to a report template's email functionality would break the report
+
 
 *Version 2.2.1*
 * Limited view of Users available for emailing a report.  User must have 1 common group to report creator.

diff --git a/Reports/src/com/serotonin/m2m2/reports/vo/ReportVO.java b/Reports/src/com/serotonin/m2m2/reports/vo/ReportVO.java
@@ -523,6 +523,7 @@ private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundE
             scheduleCron = SerializationHelper.readSafeUTF(in);
             email = in.readBoolean();
             recipients = (List<RecipientListEntryBean>) in.readObject();
+            RecipientListEntryBean.cleanRecipientList(recipients);
             includeData = in.readBoolean();
             zipData = in.readBoolean();
         }
@@ -559,6 +560,7 @@ else if (ver == 2) {
             scheduleCron = SerializationHelper.readSafeUTF(in);
             email = in.readBoolean();
             recipients = (List<RecipientListEntryBean>) in.readObject();
+            RecipientListEntryBean.cleanRecipientList(recipients);
             includeData = in.readBoolean();
             zipData = in.readBoolean();
         }