Commit e6298f81 by Robin Stocker Committed by Spencer Gibb

Fix NoClassDefFoundError loading RxJavaAutoConfiguration without spring-webmvc (#1442)

RxJavaReturnValueHandlerConfig can only be loaded when both spring-web and spring-webmvc are on the classpath, because it contains a reference to the WebMvcConfigurerAdapter class. But the ConditionalOnClass annotation only included the class from spring-web. In our situation, only spring-web was on the classpath, resulting in a NoClassDefFoundError for WebMvcConfigurerAdapter. Fix it by adding that class to the condition as well.
parent 704a874e
...@@ -39,7 +39,7 @@ import rx.Single; ...@@ -39,7 +39,7 @@ import rx.Single;
public class RxJavaAutoConfiguration { public class RxJavaAutoConfiguration {
@Configuration @Configuration
@ConditionalOnClass(AsyncHandlerMethodReturnValueHandler.class) @ConditionalOnClass({ AsyncHandlerMethodReturnValueHandler.class, WebMvcConfigurerAdapter.class })
protected static class RxJavaReturnValueHandlerConfig { protected static class RxJavaReturnValueHandlerConfig {
@Bean @Bean
public SingleReturnValueHandler singleReturnValueHandler() { public SingleReturnValueHandler singleReturnValueHandler() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment