From 1d9da4191e0c8bacc12a81227aff16cadd64023b Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@vmware.com>
Date: Mon, 30 Nov 2009 10:16:14 +0000
Subject: [PATCH] SPR-5802 - NullPointerException when using @CookieValue
 annotation

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2544 50f2f4bb-b051-0410-bef5-90022cba6387
---
 .../mvc/annotation/AnnotationMethodHandlerAdapter.java       | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git 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
index f6b7c420436..e8fa23d6ac5 100644
--- 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