root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

polishing

This commit is contained in:
Juergen Hoeller 2011-08-02 19:16:50 +00:00
parent 0a48936f4f
commit df1f3d40bd
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolver.java
View File

@ -296,9 +296,7 @@ public class ContentNegotiatingViewResolver extends WebApplicationObjectSupport
return NOT_ACCEPTABLE_VIEW; return NOT_ACCEPTABLE_VIEW;
} }
else { else {
if (logger.isDebugEnabled()) { logger.debug("No acceptable view found; returning null");
logger.debug("No acceptable view found; returning null");
}
return null; return null;
} }
} }
@ -361,7 +359,9 @@ public class ContentNegotiatingViewResolver extends WebApplicationObjectSupport
return mediaTypes; return mediaTypes;
} }
catch (IllegalArgumentException ex) { 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; return null;
} }
} }

12
org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/RedirectView.java
View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import org.springframework.web.context.request.RequestAttributes;
import org.springframework.web.servlet.HandlerMapping; import org.springframework.web.servlet.HandlerMapping;
import org.springframework.web.servlet.View; import org.springframework.web.servlet.View;
import org.springframework.web.util.UriTemplate; import org.springframework.web.util.UriTemplate;
@ -285,9 +283,11 @@ public class RedirectView extends AbstractUrlBasedView {
try { try {
String encoded = UriUtils.encodeUri(uri, encoding); String encoded = UriUtils.encodeUri(uri, encoding);
return new URI(encoded); return new URI(encoded);
} catch (UnsupportedEncodingException ex) { }
catch (UnsupportedEncodingException ex) {
throw new IllegalStateException(ex); throw new IllegalStateException(ex);
} catch (URISyntaxException ex) { }
catch (URISyntaxException ex) {
throw new IllegalArgumentException("Could not create URI from [" + uri + "]: " + ex, 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. * Determines the status code to use for HTTP 1.1 compatible requests.
* <p>The default implemenetation returns the {@link #setStatusCode(HttpStatus) statusCode} * <p>The default implementation returns the {@link #setStatusCode(HttpStatus) statusCode}
* property if set, or the value of the {@link #RESPONSE_STATUS_ATTRIBUTE} attribute. * 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). * If neither are set, it defaults to {@link HttpStatus#SEE_OTHER} (303).
* @param request the request to inspect * @param request the request to inspect