diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolver.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolver.java index 78cff4d7eed..142b4e949c6 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolver.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolver.java @@ -296,9 +296,7 @@ public class ContentNegotiatingViewResolver extends WebApplicationObjectSupport return NOT_ACCEPTABLE_VIEW; } else { - if (logger.isDebugEnabled()) { - logger.debug("No acceptable view found; returning null"); - } + logger.debug("No acceptable view found; returning null"); return null; } } @@ -361,7 +359,9 @@ public class ContentNegotiatingViewResolver extends WebApplicationObjectSupport return mediaTypes; } catch (IllegalArgumentException ex) { - logger.debug("Could not parse accept header [" + acceptHeader + "]: " + ex.getMessage()); + if (logger.isDebugEnabled()) { + logger.debug("Could not parse accept header [" + acceptHeader + "]: " + ex.getMessage()); + } return null; } } diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/RedirectView.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/RedirectView.java index 4c7777c5b1a..cc85b714852 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/RedirectView.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/RedirectView.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,14 +30,12 @@ import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.springframework.beans.BeanUtils; import org.springframework.http.HttpStatus; import org.springframework.util.ObjectUtils; -import org.springframework.web.context.request.RequestAttributes; import org.springframework.web.servlet.HandlerMapping; import org.springframework.web.servlet.View; import org.springframework.web.util.UriTemplate; @@ -285,9 +283,11 @@ public class RedirectView extends AbstractUrlBasedView { try { String encoded = UriUtils.encodeUri(uri, encoding); return new URI(encoded); - } catch (UnsupportedEncodingException ex) { + } + catch (UnsupportedEncodingException ex) { throw new IllegalStateException(ex); - } catch (URISyntaxException ex) { + } + catch (URISyntaxException ex) { throw new IllegalArgumentException("Could not create URI from [" + uri + "]: " + ex, ex); } } @@ -476,7 +476,7 @@ public class RedirectView extends AbstractUrlBasedView { /** * Determines the status code to use for HTTP 1.1 compatible requests. - *

The default implemenetation returns the {@link #setStatusCode(HttpStatus) statusCode} + *

The default implementation returns the {@link #setStatusCode(HttpStatus) statusCode} * property if set, or the value of the {@link #RESPONSE_STATUS_ATTRIBUTE} attribute. * If neither are set, it defaults to {@link HttpStatus#SEE_OTHER} (303). * @param request the request to inspect