SPR-5802 - NullPointerException when using @CookieValue annotation

poutsma · poutsma · commit 541aae12ef82 · 2009-11-30T10:16:14.000Z
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
@@ -600,9 +600,12 @@ protected Object resolveCookieValue(String cookieName, Class paramType, NativeWe
 			if (Cookie.class.isAssignableFrom(paramType)) {
 				return cookieValue;
 			}
-			else {
+			else if (cookieValue != null) {
 				return cookieValue.getValue();
 			}
+			else {
+				return null;
+			}
 		}
 
 		@Override

Original file line number	Diff line number	Diff line change
`@@ -600,9 +600,12 @@ protected Object resolveCookieValue(String cookieName, Class paramType, NativeWe`
`600`	`600`	`if (Cookie.class.isAssignableFrom(paramType)) {`
`601`	`601`	`return cookieValue;`
`602`	`602`	`}`
`603`		`- else {`
	`603`	`+ else if (cookieValue != null) {`
`604`	`604`	`return cookieValue.getValue();`
`605`	`605`	`}`
	`606`	`+ else {`
	`607`	`+ return null;`
	`608`	`+ }`
`606`	`609`	`}`
`607`	`610`
`608`	`611`	`@Override`