[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/2b06bafc
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/2b06bafc
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/2b06bafc

Branch: refs/heads/master
Commit: 2b06bafc58ccc0d2b9a1be137f0965ff111b08d4
Parents: 52badc4
Author: Francesco Chicchiriccò <ilgro...@apache.org>
Authored: Fri Mar 3 11:45:57 2017 +0100
Committer: Francesco Chicchiriccò <ilgro...@apache.org>
Committed: Fri Mar 3 14:00:38 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/2b06bafc/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