SPR-5802 - NullPointerException when using @CookieValue annotation

2009-11-30 10:16:14 +00:00
parent 73b54f4efe
commit 541aae12ef
1 changed files with 4 additions and 1 deletions
--- a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/AnnotationMethodHandlerAdapter.java
+++ b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/AnnotationMethodHandlerAdapter.java
@@ -600,9 +600,12 @@ public class AnnotationMethodHandlerAdapter extends PortletContentGenerator impl
 			if (Cookie.class.isAssignableFrom(paramType)) {
 				return cookieValue;
 			}
-			else {
+			else if (cookieValue != null) {
 				return cookieValue.getValue();
 			}
+			else {
+				return null;
+			}
 		}

 		@Override