From 7e7aa06547c1a57bdcfb8ca33a3dfcc3e02cf4df Mon Sep 17 00:00:00 2001
From: Stevo Slavic <sslavic@gmail.com>
Date: Fri, 2 Mar 2012 00:23:02 +0100
Subject: [PATCH] Fix MultipartResolver javadoc implementation refs

Before this fix MultipartResolver javadoc mentioned that there is only
one concrete implementation included in Spring. This was true as of
Spring 2.5 but Spring 3.1 added another one, Servlet 3.0 Part API based
implementation.

This fix changes MultipartResolver javadoc so that the other one,
StandardServletMultipartResolver implementation, gets also listed.
Changed javadoc mentions also as of which version does Spring bundle
two MultipartResolver implementations.

Issue: SPR-5984
---
 .../org/springframework/web/multipart/MultipartResolver.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/org.springframework.web/src/main/java/org/springframework/web/multipart/MultipartResolver.java b/org.springframework.web/src/main/java/org/springframework/web/multipart/MultipartResolver.java
index 0e6a5baaba12..3a7446353052 100644
--- a/org.springframework.web/src/main/java/org/springframework/web/multipart/MultipartResolver.java
+++ b/org.springframework.web/src/main/java/org/springframework/web/multipart/MultipartResolver.java
@@ -24,10 +24,10 @@
  * Implementations are typically usable both within an application context
  * and standalone.
  *
- * <p>There is only one concrete implementation included in Spring,
- * as of Spring 2.5:
+ * <p>There are two concrete implementations included in Spring, as of Spring 3.1:
  * <ul>
  * <li>{@link org.springframework.web.multipart.commons.CommonsMultipartResolver} for Jakarta Commons FileUpload
+ * <li>{@link org.springframework.web.multipart.support.StandardServletMultipartResolver} for Servlet 3.0 Part API
  * </ul>
  *
  * <p>There is no default resolver implementation used for Spring