SPR-5802 - NullPointerException when using @CookieValue annotation

org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java

@@ -638,9 +638,12 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator implemen
 			if (Cookie.class.isAssignableFrom(paramType)) {
 				return cookieValue;
 			}
-			else {
+			else if (cookieValue != null) {
 				return cookieValue.getValue();
 			}
+			else {
+				return null;
+			}
 		}
 
 		@Override