Author: tyrell
Date: Thu Jan 17 23:01:19 2008
New Revision: 12458
Log:
Adding a null check when retrieving cookies from session.
Modified:
trunk/mashup/java/modules/www/signout.jsp
Modified: trunk/mashup/java/modules/www/signout.jsp
==============================================================================
--- trunk/mashup/java/modules/www/signout.jsp (original)
+++ trunk/mashup/java/modules/www/signout.jsp Thu Jan 17 23:01:19 2008
@@ -51,9 +51,6 @@
<%@ page import="java.util.List" %>
<%@ page import="java.util.Map" %>
-<!--Required to keep a user logged in if 'Remember Me' option is selected-->
-<%@ include file="validate_login.jsp" %>
-
<%
// required by header.jsp
String thisPage = "signout.jsp";
@@ -99,18 +96,22 @@
request.getSession().setAttribute(MashupConstants.USER_REGISTRY,
secureRegistry);
//Deleting user login cookies
- curCookie = null;
- for (int x = 0; x < cookies.length; x++) {
- curCookie = cookies[x];
- if (curCookie.getName().equalsIgnoreCase("rememberMe")) {
- curCookie.setMaxAge(0);
- response.addCookie(curCookie);
- } else if (curCookie.getName().equalsIgnoreCase("username")) {
- curCookie.setMaxAge(0);
- response.addCookie(curCookie);
- } else if (curCookie.getName().equalsIgnoreCase("password")) {
- curCookie.setMaxAge(0);
- response.addCookie(curCookie);
+ Cookie[] cookies = request.getCookies();
+
+ if (cookies != null) {
+ Cookie curCookie = null;
+ for (int x = 0; x < cookies.length; x++) {
+ curCookie = cookies[x];
+ if (curCookie.getName().equalsIgnoreCase("rememberMe")) {
+ curCookie.setMaxAge(0);
+ response.addCookie(curCookie);
+ } else if (curCookie.getName().equalsIgnoreCase("username")) {
+ curCookie.setMaxAge(0);
+ response.addCookie(curCookie);
+ } else if (curCookie.getName().equalsIgnoreCase("password")) {
+ curCookie.setMaxAge(0);
+ response.addCookie(curCookie);
+ }
}
}
_______________________________________________
Mashup-dev mailing list
[email protected]
http://www.wso2.org/cgi-bin/mailman/listinfo/mashup-dev
