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 2018/06/11 07:13:33 UTC
[4/4] syncope git commit: [SYNCOPE-1318] The actual fix: in case of
uncontrolled error, do proper logout
[SYNCOPE-1318] The actual fix: in case of uncontrolled error, do proper logout
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/26e2b9dd
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/26e2b9dd
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/26e2b9dd
Branch: refs/heads/master
Commit: 26e2b9dd3c7f01eb0572883ae0877d29fbdf53fa
Parents: a846feb
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Jun 11 09:13:06 2018 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Jun 11 09:13:18 2018 +0200
----------------------------------------------------------------------
.../console/SyncopeConsoleRequestCycleListener.java | 3 +--
.../syncope/client/console/SyncopeConsoleSession.java | 12 ------------
2 files changed, 1 insertion(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/26e2b9dd/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleRequestCycleListener.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleRequestCycleListener.java b/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleRequestCycleListener.java
index 91e55e6..50c5748 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleRequestCycleListener.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleRequestCycleListener.java
@@ -99,8 +99,7 @@ public class SyncopeConsoleRequestCycleListener extends AbstractRequestCycleList
if (errorPage instanceof Login) {
try {
- SyncopeConsoleSession.get().cleanup();
- SyncopeConsoleSession.get().invalidateNow();
+ SyncopeConsoleSession.get().invalidate();
} catch (Throwable t) {
// ignore
LOG.debug("Unexpected error while forcing logout after error", t);
http://git-wip-us.apache.org/repos/asf/syncope/blob/26e2b9dd/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleSession.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleSession.java b/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleSession.java
index fbc5628..568148c 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleSession.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleSession.java
@@ -197,18 +197,6 @@ public class SyncopeConsoleSession extends AuthenticatedWebSession {
super.invalidate();
}
- @Override
- public void invalidateNow() {
- if (getJWT() != null) {
- if (client != null) {
- client.logout();
- }
- cleanup();
- }
- executor.shutdown();
- super.invalidateNow();
- }
-
public UserTO getSelfTO() {
return selfTO;
}