modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java | 2 +- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/UserSessionManager.java | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-)
New commits: commit b671cbfcba20b9ff445b17410a816231e6bcb420 Author: Simeon Pinder spinder@redhat.com Date: Thu Oct 14 13:14:15 2010 -0400
i)fixed on more new registration session issue ii)extracted UserSessionManager.invalidateSession() method.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java index ff9f246..da1ee4c 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java @@ -290,7 +290,7 @@ public class LoginView extends Canvas { IButton logout = new IButton("Logout"); logout.addClickHandler(new ClickHandler() { public void onClick(ClickEvent event) { - UserSessionManager.logout(); + UserSessionManager.invalidateSession(); window.destroy(); loginShowing = false; new LoginView().showLoginDialog(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/UserSessionManager.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/UserSessionManager.java index 0dc4482..2d283a3 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/UserSessionManager.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/UserSessionManager.java @@ -176,6 +176,7 @@ public class UserSessionManager { } }); } else {//invalid session. Back to login + loggedIn = false; new LoginView().showLoginDialog(); } } @@ -301,6 +302,15 @@ public class UserSessionManager { return; // nothing to do, already called }
+ invalidateSession(); + } + + /** There are times when you're logged in but you don't want the application to proceed as if you are. + * In these cases, like LDAP new user registration, the session only needs + * to be invalidated to reset the user back to the beginning. + */ + public static void invalidateSession() { + loggedIn = false; Log.info("Destroying session timer..."); sessionTimer.cancel();
rhq-commits@lists.fedorahosted.org