From bc3064cbb76d3fa8392622742348b87ce0fbfa10 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Fri, 20 Dec 2013 01:28:40 +0100 Subject: [PATCH] Polishing --- .../annotation/HttpEntityMethodProcessor.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessor.java index d5284d62687..c7e787f4e7e 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessor.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessor.java @@ -64,8 +64,7 @@ public class HttpEntityMethodProcessor extends AbstractMessageConverterMethodPro @Override public boolean supportsParameter(MethodParameter parameter) { - Class parameterType = parameter.getParameterType(); - return HttpEntity.class.equals(parameterType); + return HttpEntity.class.equals(parameter.getParameterType()); } @Override @@ -87,12 +86,15 @@ public class HttpEntityMethodProcessor extends AbstractMessageConverterMethodPro private Type getHttpEntityType(MethodParameter parameter) { Assert.isAssignable(HttpEntity.class, parameter.getParameterType()); - ParameterizedType type = (ParameterizedType) parameter.getGenericParameterType(); - if (type.getActualTypeArguments().length == 1) { - return type.getActualTypeArguments()[0]; + Type parameterType = parameter.getGenericParameterType(); + if (parameterType instanceof ParameterizedType) { + ParameterizedType type = (ParameterizedType) parameterType; + if (type.getActualTypeArguments().length == 1) { + return type.getActualTypeArguments()[0]; + } } - throw new IllegalArgumentException("HttpEntity parameter (" + parameter.getParameterName() + - ") in method " + parameter.getMethod() + " is not parameterized or has more than one parameter"); + throw new IllegalArgumentException("HttpEntity parameter '" + parameter.getParameterName() + + "' in method " + parameter.getMethod() + " is not parameterized or has more than one parameter"); } @Override