You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by rm...@apache.org on 2012/10/17 15:37:05 UTC
svn commit: r1399244 -
/incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/logon/LogoutAction.java
Author: rmatthews
Date: Wed Oct 17 13:37:05 2012
New Revision: 1399244
URL: http://svn.apache.org/viewvc?rev=1399244&view=rev
Log:
ISIS-162 - add element to logoff user.
Modified:
incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/logon/LogoutAction.java
Modified: incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/logon/LogoutAction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/logon/LogoutAction.java?rev=1399244&r1=1399243&r2=1399244&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/logon/LogoutAction.java (original)
+++ incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/logon/LogoutAction.java Wed Oct 17 13:37:05 2012
@@ -27,9 +27,23 @@ import org.apache.isis.runtimes.dflt.run
import org.apache.isis.viewer.scimpi.dispatcher.Action;
import org.apache.isis.viewer.scimpi.dispatcher.UserManager;
import org.apache.isis.viewer.scimpi.dispatcher.context.RequestContext;
+import org.apache.isis.viewer.scimpi.dispatcher.context.RequestContext.Scope;
public class LogoutAction implements Action {
+ public static void logoutUser(final RequestContext context) {
+ if (context.isUserAuthenticated()) {
+ final AuthenticationSession session = context.getSession();
+ if (session != null) {
+ IsisContext.getUpdateNotifier().clear();
+ UserManager.logoffUser(session);
+ }
+ context.endHttpSession();
+ context.setUserAuthenticated(false);
+ }
+ context.clearVariables(Scope.SESSION);
+ }
+
@Override
public String getName() {
return "logout";
@@ -41,15 +55,7 @@ public class LogoutAction implements Act
@Override
public void process(final RequestContext context) throws IOException {
- if (context.isUserAuthenticated()) {
- final AuthenticationSession session = context.getSession();
- if (session != null) {
- IsisContext.getUpdateNotifier().clear();
- UserManager.logoffUser(session);
- }
- context.endHttpSession();
- context.setUserAuthenticated(false);
- }
+ logoutUser(context);
String view = context.getParameter("view");
if (view == null) {