Skip to content

Commit 575d083

Browse files
Merge 20.7.7 to develop
2 parents 762c0ab + d2a7a54 commit 575d083

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

LDK/src/org/labkey/ldk/notification/SiteSummaryNotification.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.apache.logging.log4j.LogManager;
2424
import org.json.JSONArray;
2525
import org.json.JSONObject;
26+
import org.labkey.api.action.SpringActionController;
2627
import org.labkey.api.audit.AuditLogService;
2728
import org.labkey.api.audit.AuditTypeProvider;
2829
import org.labkey.api.data.CompareType;
@@ -169,7 +170,12 @@ private void saveValues(Container c, Map<String, String> saved, Map<String, Stri
169170
newValues.put(lastSave, String.valueOf(new Date().getTime()));
170171
map.putAll(newValues);
171172

172-
map.save();
173+
// this is recording when the report was last run, which is similar to audit logging and similar activities
174+
// that we are comfortable treating as non-mutating.
175+
try (var ignored = SpringActionController.ignoreSqlUpdates())
176+
{
177+
map.save();
178+
}
173179
}
174180

175181
@Override

laboratory/src/org/labkey/laboratory/notification/LabSummaryNotification.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import org.apache.logging.log4j.LogManager;
77
import org.json.JSONArray;
88
import org.json.JSONObject;
9+
import org.labkey.api.action.SpringActionController;
910
import org.labkey.api.data.Container;
1011
import org.labkey.api.data.CoreSchema;
1112
import org.labkey.api.data.DbSchema;
@@ -117,7 +118,12 @@ private void saveValues(Container c, Map<String, String> saved, Map<String, Stri
117118
newValues.put(lastSave, String.valueOf(new Date().getTime()));
118119
map.putAll(newValues);
119120

120-
map.save();
121+
// this is recording when the report was last run, which is similar to audit logging and similar activities
122+
// that we are comfortable treating as non-mutating.
123+
try (var ignored = SpringActionController.ignoreSqlUpdates())
124+
{
125+
map.save();
126+
}
121127
}
122128

123129
private String getPctChange(Long oldVal, Long newVal, double threshold)

0 commit comments

Comments
 (0)