Repository: syncope
Updated Branches:
  refs/heads/2_0_X 86a2a4ebe -> 247868da3
  refs/heads/master 52badc4b9 -> b2b8ee199


[SYNCOPE-1035] Fix for console logout


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/8814549e
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/8814549e
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/8814549e

Branch: refs/heads/2_0_X
Commit: 8814549ee2297f6353e115c77f968bf5be403e71
Parents: 86a2a4e
Author: Francesco Chicchiriccò <[email protected]>
Authored: Fri Mar 3 11:45:57 2017 +0100
Committer: Francesco Chicchiriccò <[email protected]>
Committed: Fri Mar 3 11:45:57 2017 +0100

----------------------------------------------------------------------
 .../apache/syncope/client/console/SyncopeConsoleSession.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/8814549e/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 1ce3b71..7a023f8 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
@@ -131,14 +131,18 @@ public class SyncopeConsoleSession extends 
AuthenticatedWebSession {
 
     @Override
     public void invalidate() {
-        client.logout();
+        if (getJWT() != null) {
+            client.logout();
+        }
         executorService.shutdown();
         super.invalidate();
     }
 
     @Override
     public void invalidateNow() {
-        client.logout();
+        if (getJWT() != null) {
+            client.logout();
+        }
         executorService.shutdownNow();
         super.invalidateNow();
     }

Reply via email to