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:36:59 UTC
[syncope] branch 2_1_X updated: [SYNCOPE-1474] Use updated info
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new 6d7d557 [SYNCOPE-1474] Use updated info
6d7d557 is described below
commit 6d7d5574dfc2d4e753a9189e7ad4cc9fa89e4a54
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Wed Sep 11 11:31:42 2019 +0200
[SYNCOPE-1474] Use updated info
---
.../java/org/apache/syncope/client/console/batch/BatchContent.java | 4 ++--
.../syncope/client/console/status/AnyStatusDirectoryPanel.java | 5 ++---
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/batch/BatchContent.java b/client/console/src/main/java/org/apache/syncope/client/console/batch/BatchContent.java
index b0138e9..5da3f35 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/batch/BatchContent.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/batch/BatchContent.java
@@ -164,8 +164,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);
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/status/AnyStatusDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/status/AnyStatusDirectoryPanel.java
index 2e372e7..d92afe9 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/status/AnyStatusDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/status/AnyStatusDirectoryPanel.java
@@ -288,8 +288,7 @@ public class AnyStatusDirectoryPanel
List<StatusBean> statusBeans = actual.getResources().stream().map(resource -> {
List<Pair<String, ReconStatus>> statuses = Collections.emptyList();
if (statusOnly) {
- statuses = StatusUtils.
- getReconStatuses(anyTypeKind, anyTO.getKey(), Arrays.asList(resource));
+ statuses = StatusUtils.getReconStatuses(anyTypeKind, anyTO.getKey(), Arrays.asList(resource));
}
return StatusUtils.getStatusBean(
@@ -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,