Changeset 337

Timestamp:

04/06/06 11:55:33

Author:

douglm

Message:

Clean up and close on logout

Files:

• branches/REL-3.0/calendar3/common/src/edu/rpi/sss/util/jsp/UtilAbstractAction.java (modified) (4 diffs)
• branches/REL-3.0/calendar3/webcommon/src/org/bedework/webcommon/BwAbstractAction.java (modified) (1 diff)

branches/REL-3.0/calendar3/common/src/edu/rpi/sss/util/jsp/UtilAbstractAction.java

@@ -313 +313 @@
-         ---------------------------------------------------------------- */
-
-
+, form
-      if (forward != null) {
-        // Disable xslt filters
@@ -656 +656 @@
-   * ==================================================================== */
-
+  /** Clean up - we're about to logout
+   *
+   * @param request    HttpServletRequest
+   * @return boolean true for OK to log out. False - not allowed - ignore it.
+   */
+  protected boolean logOutCleanup(HttpServletRequest request,
+                                  UtilActionForm form) {
+    return true;
+  }
+
-  /** Check for logout request.
-   *
@@ -661 +671 @@
-   * @return null for continue, forwardLoggedOut to end session.
-   */
-
+
+
-               throws Throwable {
-    String temp = request.getParameter(requestLogout);
@@ -667 +678 @@
-      HttpSession sess = request.getSession(false);
-
-sess != null
+(sess != null) && logOutCleanup(request, form)
-        sess.invalidate();
-      }

branches/REL-3.0/calendar3/webcommon/src/org/bedework/webcommon/BwAbstractAction.java

@@ -837 +837 @@
-  }
-
+  /* We should probably return false for a portlet
+   *  (non-Javadoc)
+   * @see edu.rpi.sss.util.jsp.UtilAbstractAction#logOutCleanup(javax.servlet.http.HttpServletRequest)
+   */
+  protected boolean logOutCleanup(HttpServletRequest request,
+                                  UtilActionForm form) {
+    HttpSession hsess = request.getSession();
+    BwCallback cb = (BwCallback)hsess.getAttribute(BwCallback.cbAttrName);
+    
+    if (cb == null) {
+      if (form.getDebug()) {
+        debugMsg("No cb object for logout");
+      }
+    } else {
+      if (form.getDebug()) {
+        debugMsg("cb object found for logout");
+      }
+      try {
+        cb.out();
+      } catch (Throwable t) {}
+      
+      try {
+        cb.close();
+      } catch (Throwable t) {}
+    }
+    
+    return true;
+  }
+
+
-  /** Ensure we have a CalAdminSvcI object for the given user.
-   *