[syncope] branch 2_1_X updated: [SYNCOPE-129] Fixes

[ilgrosso]

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 4d178b8  [SYNCOPE-129] Fixes
4d178b8 is described below

commit 4d178b8a29af4c58017b3673833967616546b2e4
Author: Francesco Chicchiriccò <ilgro...@apache.org>
AuthorDate: Tue Jun 29 13:56:28 2021 +0200

    [SYNCOPE-129] Fixes
---
 .../syncope/client/console/panels/DelegationDirectoryPanel.java     | 4 +---
 .../syncope/client/console/wizards/DelegationWizardBuilder.java     | 6 +++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git 
a/client/console/src/main/java/org/apache/syncope/client/console/panels/DelegationDirectoryPanel.java
 
b/client/console/src/main/java/org/apache/syncope/client/console/panels/DelegationDirectoryPanel.java
index 96d6b6e..41b9041 100644
--- 
a/client/console/src/main/java/org/apache/syncope/client/console/panels/DelegationDirectoryPanel.java
+++ 
b/client/console/src/main/java/org/apache/syncope/client/console/panels/DelegationDirectoryPanel.java
@@ -166,7 +166,7 @@ public class DelegationDirectoryPanel extends
                     
SyncopeConsoleSession.get().success(getString(Constants.OPERATION_SUCCEEDED));
                     target.add(container);
                 } catch (Exception e) {
-                    LOG.error("While deleting {}", model.getObject(), e);
+                    LOG.error("While deleting {}", model.getObject().getKey(), 
e);
                     SyncopeConsoleSession.get().onException(e);
                 }
                 ((BasePage) 
pageRef.getPage()).getNotificationPanel().refresh(target);
@@ -197,8 +197,6 @@ public class DelegationDirectoryPanel extends
 
         private final SortableDataProviderComparator<DelegationTO> comparator;
 
-        private final DelegationRestClient restClient = new 
DelegationRestClient();
-
         public DelegationDataProvider(final int paginatorRows) {
             super(paginatorRows);
             this.comparator = new SortableDataProviderComparator<>(this);
diff --git 
a/client/console/src/main/java/org/apache/syncope/client/console/wizards/DelegationWizardBuilder.java
 
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/DelegationWizardBuilder.java
index d18eb6a..3b97f08 100644
--- 
a/client/console/src/main/java/org/apache/syncope/client/console/wizards/DelegationWizardBuilder.java
+++ 
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/DelegationWizardBuilder.java
@@ -101,10 +101,10 @@ public class DelegationWizardBuilder extends 
AjaxWizardBuilder<DelegationTO> {
                     delegating = 
Model.of(userRestClient.read(delegating.getObject()).getUsername());
                     delegated = 
Model.of(userRestClient.read(delegated.getObject()).getUsername());
                 } else {
-                    if 
(SyncopeConsoleSession.get().getSelfTO().getKey().equals(delegating)) {
+                    if 
(SyncopeConsoleSession.get().getSelfTO().getKey().equals(delegating.getObject()))
 {
                         delegating = 
Model.of(SyncopeConsoleSession.get().getSelfTO().getUsername());
                     }
-                    if 
(SyncopeConsoleSession.get().getSelfTO().getKey().equals(delegated)) {
+                    if 
(SyncopeConsoleSession.get().getSelfTO().getKey().equals(delegated.getObject()))
 {
                         delegated = 
Model.of(SyncopeConsoleSession.get().getSelfTO().getUsername());
                     }
                 }
@@ -130,7 +130,7 @@ public class DelegationWizardBuilder extends 
AjaxWizardBuilder<DelegationTO> {
         }
     }
 
-    private class StartEnd extends WizardStep {
+    private static class StartEnd extends WizardStep {
 
         private static final long serialVersionUID = 16957451737824L;