SPR-5802 - NullPointerException when using @CookieValue annotation

poutsma · poutsma · commit 1dc346a32c86 · 2009-06-11T08:53:56.000Z
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
@@ -638,9 +638,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
`@@ -638,9 +638,12 @@ protected Object resolveCookieValue(String cookieName, Class paramType, NativeWe`
`638`	`638`	`if (Cookie.class.isAssignableFrom(paramType)) {`
`639`	`639`	`return cookieValue;`
`640`	`640`	`}`
`641`		`- else {`
	`641`	`+ else if (cookieValue != null) {`
`642`	`642`	`return cookieValue.getValue();`
`643`	`643`	`}`
	`644`	`+ else {`
	`645`	`+ return null;`
	`646`	`+ }`
`644`	`647`	`}`
`645`	`648`
`646`	`649`	`@Override`