Repository: syncope Updated Branches: refs/heads/master f85e2d8d3 -> 355ffbb9c
[SYNCOPE-744] Small fix to reconciliation widget Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/355ffbb9 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/355ffbb9 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/355ffbb9 Branch: refs/heads/master Commit: 355ffbb9c42fceb2b13767435c10346471eef2ff Parents: f85e2d8 Author: Francesco Chicchiriccò <[email protected]> Authored: Tue Mar 15 15:43:40 2016 +0100 Committer: Francesco Chicchiriccò <[email protected]> Committed: Tue Mar 15 15:43:40 2016 +0100 ---------------------------------------------------------------------- .../client/console/widgets/ReconciliationWidget.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/355ffbb9/client/console/src/main/java/org/apache/syncope/client/console/widgets/ReconciliationWidget.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/widgets/ReconciliationWidget.java b/client/console/src/main/java/org/apache/syncope/client/console/widgets/ReconciliationWidget.java index 71ddcdf..8693f39 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/widgets/ReconciliationWidget.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/widgets/ReconciliationWidget.java @@ -100,6 +100,8 @@ public class ReconciliationWidget extends BaseWidget { private static final int ROWS = 10; + private final Long reconciliationReportKey; + private final BaseModal<Any> detailsModal = new BaseModal<>("detailsModal"); private final PageReference pageRef; @@ -121,12 +123,14 @@ public class ReconciliationWidget extends BaseWidget { overlay.setVisible(false); add(overlay); + this.reconciliationReportKey = SyncopeConsoleApplication.get().getReconciliationReportKey(); + ReportTO reconciliationReport = null; try { - reconciliationReport = restClient.read(SyncopeConsoleApplication.get().getReconciliationReportKey()); + reconciliationReport = restClient.read(reconciliationReportKey); } catch (Exception e) { LOG.error("Could not fetch the expected reconciliation report with key {}, aborting", - SyncopeConsoleApplication.get().getReconciliationReportKey(), e); + reconciliationReportKey, e); } Fragment reportResult = reconciliationReport == null || reconciliationReport.getExecutions().isEmpty() @@ -157,7 +161,7 @@ public class ReconciliationWidget extends BaseWidget { @Override public void onClick(final AjaxRequestTarget target) { try { - restClient.startExecution(SyncopeConsoleApplication.get().getReconciliationReportKey(), null); + restClient.startExecution(reconciliationReportKey, null); overlay.setVisible(true); target.add(ReconciliationWidget.this); @@ -243,7 +247,7 @@ public class ReconciliationWidget extends BaseWidget { @Override public boolean evaluate(final ExecTO exec) { - return exec.getRefKey() == SyncopeConsoleApplication.get().getReconciliationReportKey(); + return reconciliationReportKey.equals(exec.getRefKey()); } }); if (exec == null) { @@ -513,8 +517,7 @@ public class ReconciliationWidget extends BaseWidget { } }); if (reportJobTO != null && !reportJobTO.isRunning()) { - LOG.debug("Report {} is not running", - SyncopeConsoleApplication.get().getReconciliationReportKey()); + LOG.debug("Report {} is not running", reconciliationReportKey); WebSocketSettings webSocketSettings = WebSocketSettings.Holder.get(application); WebSocketPushBroadcaster broadcaster =
