From 1dc346a32c86f9ee19dfdaf06f7234d5ba806e8d Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@vmware.com>
Date: Thu, 11 Jun 2009 08:53:56 +0000
Subject: [PATCH] SPR-5802 - NullPointerException when using @CookieValue
 annotation

---
 .../mvc/annotation/AnnotationMethodHandlerAdapter.java       | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java
index fa0e556006..464b748c16 100644
--- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java
+++ b/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