=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/ContextUtils.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/ContextUtils.java 2011-12-26 10:07:59 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/ContextUtils.java 2012-02-28 17:36:14 +0000 @@ -141,14 +141,17 @@ { Cookie[] cookies = request.getCookies(); - for ( Cookie c : cookies ) + if ( cookies != null ) { - if ( c.getName().equalsIgnoreCase( cookieName ) ) + for ( Cookie c : cookies ) { - return c.getValue(); + if ( c.getName().equalsIgnoreCase( cookieName ) ) + { + return c.getValue(); + } } } - + return null; }