Merge branch 'fix/profile-days-ago-cookie' of dlab/hive

from pull-request 1463 * refs/heads/fix/profile-days-ago-cookie: user/profile: Fix a server error by an empty daysAgo cookie Reviewed-by: 백기선 <keesun.baik@navercorp.com>
naver · Feb 5, 2015 · f6c0ae2 · f6c0ae2
2 parents 0b615e7 + ad3a136
commit f6c0ae2
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/controllers/UserApp.java b/app/controllers/UserApp.java
@@ -431,7 +431,7 @@ public static Result userInfo(String loginId, String groups, int daysAgo, String
 
         if (daysAgo == UNDEFINED) {
             Cookie cookie = request().cookie(DAYS_AGO_COOKIE);
-            if (cookie != null) {
+            if (cookie != null && StringUtils.isNotEmpty(cookie.value())) {
                 daysAgo = Integer.parseInt(cookie.value());
             } else {
                 daysAgo = DAYS_AGO;