From a99809f5f738421c645643c5af8ba3ff7e7e3518 Mon Sep 17 00:00:00 2001
From: Greg Turnquist <gturnquist@gopivotal.com>
Date: Thu, 20 Jun 2013 14:32:49 -0400
Subject: [PATCH] Fix spring.factories so MultipartAutoConfigure loads
 propertly  [BS-157]

After discovering that MultipartAutoConfigure wasn't loading when used,
realized I needed to register it with spring.factories. Added it there,
but it broke some tests. So tweaked it so that it only loads if the
specified bean is detected.
---
 .../bootstrap/autoconfigure/web/MultipartAutoConfiguration.java  | 1 +
 spring-bootstrap/src/main/resources/META-INF/spring.factories    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/web/MultipartAutoConfiguration.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/web/MultipartAutoConfiguration.java
index b8b14ee2a29..e325afc9375 100644
--- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/web/MultipartAutoConfiguration.java
+++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/web/MultipartAutoConfiguration.java
@@ -32,6 +32,7 @@ import org.springframework.web.multipart.support.StandardServletMultipartResolve
  * @author Greg Turnquist
  */
 @Configuration
+@ConditionalOnBean(MultipartConfigElement.class)
 public class MultipartAutoConfiguration {
 
 	@Bean
diff --git a/spring-bootstrap/src/main/resources/META-INF/spring.factories b/spring-bootstrap/src/main/resources/META-INF/spring.factories
index 4381606018a..7836cb266bd 100644
--- a/spring-bootstrap/src/main/resources/META-INF/spring.factories
+++ b/spring-bootstrap/src/main/resources/META-INF/spring.factories
@@ -10,6 +10,7 @@ org.springframework.bootstrap.autoconfigure.orm.jpa.HibernateJpaAutoConfiguratio
 org.springframework.bootstrap.autoconfigure.thymeleaf.ThymeleafAutoConfiguration,\
 org.springframework.bootstrap.autoconfigure.web.EmbeddedServletContainerAutoConfiguration,\
 org.springframework.bootstrap.autoconfigure.web.ServerPropertiesAutoConfiguration,\
+org.springframework.bootstrap.autoconfigure.web.MultipartAutoConfiguration,\
 org.springframework.bootstrap.autoconfigure.web.WebMvcAutoConfiguration
 
 # Application Context Initializers