You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2019/09/11 09:37:02 UTC
[syncope] branch master updated: [SYNCOPE-1474] Use updated info
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push:
new 21d43a3 [SYNCOPE-1474] Use updated info
21d43a3 is described below
commit 21d43a3014db1403c6486bb66748f9204c5a2ad9
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Wed Sep 11 11:31:42 2019 +0200
[SYNCOPE-1474] Use updated info
---
.../syncope/client/console/status/AnyStatusDirectoryPanel.java | 5 ++---
.../java/org/apache/syncope/client/console/batch/BatchContent.java | 4 ++--
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/client/idm/console/src/main/java/org/apache/syncope/client/console/status/AnyStatusDirectoryPanel.java b/client/idm/console/src/main/java/org/apache/syncope/client/console/status/AnyStatusDirectoryPanel.java
index 5fb41dd..495ddd7 100644
--- a/client/idm/console/src/main/java/org/apache/syncope/client/console/status/AnyStatusDirectoryPanel.java
+++ b/client/idm/console/src/main/java/org/apache/syncope/client/console/status/AnyStatusDirectoryPanel.java
@@ -289,8 +289,7 @@ public class AnyStatusDirectoryPanel
List<StatusBean> statusBeans = actual.getResources().stream().map(resource -> {
List<Pair<String, ReconStatus>> statuses = List.of();
if (statusOnly) {
- statuses = ReconStatusUtils.
- getReconStatuses(anyTypeKind, anyTO.getKey(), List.of(resource));
+ statuses = ReconStatusUtils.getReconStatuses(anyTypeKind, anyTO.getKey(), List.of(resource));
}
return StatusUtils.getStatusBean(actual,
@@ -331,7 +330,7 @@ public class AnyStatusDirectoryPanel
statusBeans.add(0, syncope);
} else {
statusBeans.addAll(resources.stream().
- filter(resource -> !anyTO.getResources().contains(resource)).
+ filter(resource -> !actual.getResources().contains(resource)).
map(resource -> {
StatusBean statusBean = StatusUtils.getStatusBean(actual,
resource,
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/batch/BatchContent.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/batch/BatchContent.java
index 5d864b3..a92e732 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/batch/BatchContent.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/batch/BatchContent.java
@@ -163,8 +163,8 @@ public class BatchContent<T extends Serializable, S> extends MultilevelPanel.Sec
ExecTO exec = ExecTO.class.cast(item);
try {
- batchExecutor.getClass().getMethod("deleteExecution",
- String.class).invoke(batchExecutor, exec.getKey());
+ batchExecutor.getClass().getMethod("deleteExecution", String.class).
+ invoke(batchExecutor, exec.getKey());
results.put(exec.getKey(), ExecStatus.SUCCESS.name());
} catch (Exception e) {
LOG.error("Error deleting execution {}", exec.getKey(), e);