[Yanel-commits] rev 59120 - public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/security/impl

[michi at wyona.com]

Author: michi
Date: 2011-07-01 15:53:40 +0200 (Fri, 01 Jul 2011)
New Revision: 59120

Modified:
   public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/security/impl/AutoLogin.java
Log:
catch null pointer

Modified: public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/security/impl/AutoLogin.java
===================================================================
--- public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/security/impl/AutoLogin.java	2011-07-01 13:50:11 UTC (rev 59119)
+++ public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/security/impl/AutoLogin.java	2011-07-01 13:53:40 UTC (rev 59120)
@@ -38,13 +38,17 @@
     public static Cookie getCookie(HttpServletRequest request) {
         Cookie result = null;
         try {
-            for (Cookie c : request.getCookies()) {
-                if (c.getName().equals(COOKIE_NAME)) {
-                    result = c;
-                    break;
+            Cookie[] cookies = request.getCookies();
+            if (cookies != null) {
+                for (Cookie c : cookies) {
+                    if (c.getName().equals(COOKIE_NAME)) {
+                        result = c;
+                        break;
+                    }
                 }
+            } else {
+                log.warn("DEBUG: No cookies by browser provided yet!");
             }
-            
         } catch (Exception e) {
             log.error("Error in retrieving cookie from request");
             log.error(e,e);