Author: tyrell
Date: Thu Jan 17 22:07:55 2008
New Revision: 12449
Log:
Adding a null check when getting cookies from request.
Modified:
trunk/mashup/java/modules/www/index.jsp
trunk/mashup/java/modules/www/validate_login.jsp
Modified: trunk/mashup/java/modules/www/index.jsp
==============================================================================
--- trunk/mashup/java/modules/www/index.jsp (original)
+++ trunk/mashup/java/modules/www/index.jsp Thu Jan 17 22:07:55 2008
@@ -62,21 +62,23 @@
request.getLocalName())) {
//Deleting previous user login cookies, if found
Cookie[] cookies = request.getCookies();
- 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);
+
+ 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);
+ }
}
}
-
response.sendRedirect("register_admin.jsp?firstcall=true");
}
Modified: trunk/mashup/java/modules/www/validate_login.jsp
==============================================================================
--- trunk/mashup/java/modules/www/validate_login.jsp (original)
+++ trunk/mashup/java/modules/www/validate_login.jsp Thu Jan 17 22:07:55 2008
@@ -27,43 +27,45 @@
Registry registry = RegistryUtils.getRegistry(request);
//Check whether the remember me option is set
- Cookie cookies[] = request.getCookies();
+ Cookie[] cookies = request.getCookies();
- boolean rememberMe = false;
- String userNameStored = null;
- String passwordStored = null;
-
- Cookie curCookie = null;
- for (int x = 0; x < cookies.length; x++) {
- curCookie = cookies[x];
- if (curCookie.getName().equalsIgnoreCase("rememberMe")) {
- rememberMe = true;
- } else if (curCookie.getName().equalsIgnoreCase("username")) {
- userNameStored = curCookie.getValue();
- } else if (curCookie.getName().equalsIgnoreCase("password")) {
- passwordStored =
- new String(new
sun.misc.BASE64Decoder().decodeBuffer(curCookie.getValue()),
- "UTF-8");
+ if (cookies != null) {
+ boolean rememberMe = false;
+ String userNameStored = null;
+ String passwordStored = null;
+
+ Cookie curCookie = null;
+ for (int x = 0; x < cookies.length; x++) {
+ curCookie = cookies[x];
+ if (curCookie.getName().equalsIgnoreCase("rememberMe")) {
+ rememberMe = true;
+ } else if (curCookie.getName().equalsIgnoreCase("username")) {
+ userNameStored = curCookie.getValue();
+ } else if (curCookie.getName().equalsIgnoreCase("password")) {
+ passwordStored =
+ new String(new
sun.misc.BASE64Decoder().decodeBuffer(curCookie.getValue()),
+ "UTF-8");
+ }
}
- }
- if (rememberMe && (userNameStored != null) && (passwordStored != null)) {
- if (!RegistryUtils.isLoggedIn(registry)) {
- ServletContext context = request.getSession().getServletContext();
+ if (rememberMe && (userNameStored != null) && (passwordStored !=
null)) {
+ if (!RegistryUtils.isLoggedIn(registry)) {
+ ServletContext context =
request.getSession().getServletContext();
- JDBCRegistry jdbcRegistry = (JDBCRegistry) context.getAttribute(
- RegistryConstants.REGISTRY);
+ JDBCRegistry jdbcRegistry = (JDBCRegistry)
context.getAttribute(
+ RegistryConstants.REGISTRY);
- Realm realm = (Realm)
context.getAttribute(RegistryConstants.REGISTRY_REALM);
+ Realm realm = (Realm)
context.getAttribute(RegistryConstants.REGISTRY_REALM);
- MashupUtils.login(userNameStored, passwordStored, session.getId());
+ MashupUtils.login(userNameStored, passwordStored,
session.getId());
- SecureRegistry secureRegistry =
- new SecureRegistry(userNameStored, jdbcRegistry, realm);
+ SecureRegistry secureRegistry =
+ new SecureRegistry(userNameStored, jdbcRegistry,
realm);
- request.getSession().setAttribute(MashupConstants.USER_REGISTRY,
secureRegistry);
+
request.getSession().setAttribute(MashupConstants.USER_REGISTRY,
secureRegistry);
- registry = secureRegistry;
+ registry = secureRegistry;
+ }
}
}
%>
\ No newline at end of file
_______________________________________________
Mashup-dev mailing list
[email protected]
http://www.wso2.org/cgi-bin/mailman/listinfo/mashup-dev
