Browse Source

Polishing

pull/1296/merge
Juergen Hoeller 9 years ago
parent
commit
95330d0e44
  1. 8
      spring-web/src/main/java/org/springframework/http/HttpStatus.java
  2. 7
      spring-web/src/main/java/org/springframework/web/multipart/support/StandardServletMultipartResolver.java

8
spring-web/src/main/java/org/springframework/http/HttpStatus.java

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2016 the original author or authors. * Copyright 2002-2017 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.
@ -128,7 +128,7 @@ public enum HttpStatus {
/** /**
* {@code 302 Moved Temporarily}. * {@code 302 Moved Temporarily}.
* @see <a href="http://tools.ietf.org/html/rfc1945#section-9.3">HTTP/1.0, section 9.3</a> * @see <a href="http://tools.ietf.org/html/rfc1945#section-9.3">HTTP/1.0, section 9.3</a>
* @deprecated In favor of {@link #FOUND} which will be returned from {@code HttpStatus.valueOf(302)} * @deprecated in favor of {@link #FOUND} which will be returned from {@code HttpStatus.valueOf(302)}
*/ */
@Deprecated @Deprecated
MOVED_TEMPORARILY(302, "Moved Temporarily"), MOVED_TEMPORARILY(302, "Moved Temporarily"),
@ -236,7 +236,7 @@ public enum HttpStatus {
/** /**
* {@code 413 Request Entity Too Large}. * {@code 413 Request Entity Too Large}.
* @see <a href="http://tools.ietf.org/html/rfc2616#section-10.4.14">HTTP/1.1, section 10.4.14</a> * @see <a href="http://tools.ietf.org/html/rfc2616#section-10.4.14">HTTP/1.1, section 10.4.14</a>
* @deprecated In favor of {@link #PAYLOAD_TOO_LARGE} which will be returned from {@code HttpStatus.valueOf(413)} * @deprecated in favor of {@link #PAYLOAD_TOO_LARGE} which will be returned from {@code HttpStatus.valueOf(413)}
*/ */
@Deprecated @Deprecated
REQUEST_ENTITY_TOO_LARGE(413, "Request Entity Too Large"), REQUEST_ENTITY_TOO_LARGE(413, "Request Entity Too Large"),
@ -249,7 +249,7 @@ public enum HttpStatus {
/** /**
* {@code 414 Request-URI Too Long}. * {@code 414 Request-URI Too Long}.
* @see <a href="http://tools.ietf.org/html/rfc2616#section-10.4.15">HTTP/1.1, section 10.4.15</a> * @see <a href="http://tools.ietf.org/html/rfc2616#section-10.4.15">HTTP/1.1, section 10.4.15</a>
* @deprecated In favor of {@link #URI_TOO_LONG} which will be returned from {@code HttpStatus.valueOf(414)} * @deprecated in favor of {@link #URI_TOO_LONG} which will be returned from {@code HttpStatus.valueOf(414)}
*/ */
@Deprecated @Deprecated
REQUEST_URI_TOO_LONG(414, "Request-URI Too Long"), REQUEST_URI_TOO_LONG(414, "Request-URI Too Long"),

7
spring-web/src/main/java/org/springframework/web/multipart/support/StandardServletMultipartResolver.java

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2014 the original author or authors. * Copyright 2002-2017 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.
@ -42,6 +42,9 @@ import org.springframework.web.multipart.MultipartResolver;
* *
* @author Juergen Hoeller * @author Juergen Hoeller
* @since 3.1 * @since 3.1
* @see #setResolveLazily
* @see HttpServletRequest#getParts()
* @see org.springframework.web.multipart.commons.CommonsMultipartResolver
*/ */
public class StandardServletMultipartResolver implements MultipartResolver { public class StandardServletMultipartResolver implements MultipartResolver {
@ -87,7 +90,7 @@ public class StandardServletMultipartResolver implements MultipartResolver {
} }
} }
} }
catch (Exception ex) { catch (Throwable ex) {
LogFactory.getLog(getClass()).warn("Failed to perform cleanup of multipart items", ex); LogFactory.getLog(getClass()).warn("Failed to perform cleanup of multipart items", ex);
} }
} }

Loading…
Cancel
Save