Tentatively fix campaign mgmt OOME (MID-4479)

Evolveum · Feb 28, 2018 · 8ae6f53 · 8ae6f53
1 parent b5f40b8
commit 8ae6f53
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
@@ -446,6 +446,14 @@ public static <T extends ObjectType> IModel<ObjectWrapper<T>> adopt(
 		return objectWrapperModel;
 	}
 
+	public static void safeResultCleanup(OperationResult result, Trace logger) {
+		try {
+			result.cleanupResult();
+		} catch (Throwable t) {
+			LoggingUtils.logUnexpectedException(logger, "Couldn't clean up the operation result", t);
+		}
+	}
+
 	public enum Channel {
 		// TODO: move this to schema component
 		LIVE_SYNC(SchemaConstants.CHANGE_CHANNEL_LIVE_SYNC_URI),

diff --git a/...ui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaign.java b/...ui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaign.java
@@ -505,6 +505,7 @@ private void executeCampaignStateOperation(AjaxRequestTarget target, String acti
 			result.computeStatusIfUnknown();
 		}
 
+		WebComponentUtil.safeResultCleanup(result, LOGGER);
 		showResult(result);
 		statModel.reset();
 		campaignModel.reset();
@@ -513,7 +514,6 @@ private void executeCampaignStateOperation(AjaxRequestTarget target, String acti
 		target.add(getFeedbackPanel());
 	}
 
-
 	private ObjectQuery createCaseQuery() {
 		ObjectQuery query = new ObjectQuery();
 		return query;