From fcf20bab2ad1ce4c335927c0f99ac7accdc9d7b3 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Wed, 15 Jul 2020 18:58:31 +0200 Subject: [PATCH] Delete duplicate code block in WebHttpHandlerBuilder.applicationContext() This commit deletes a duplicated code block that was accidentally introduced in a8a1fc6de5be2307eb56844ac1df1a09168f2ad9. Closes gh-25389 --- .../web/server/adapter/WebHttpHandlerBuilder.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/spring-web/src/main/java/org/springframework/web/server/adapter/WebHttpHandlerBuilder.java b/spring-web/src/main/java/org/springframework/web/server/adapter/WebHttpHandlerBuilder.java index 6e6c9878c82..7770a76a1b3 100644 --- a/spring-web/src/main/java/org/springframework/web/server/adapter/WebHttpHandlerBuilder.java +++ b/spring-web/src/main/java/org/springframework/web/server/adapter/WebHttpHandlerBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2018 the original author or authors. + * Copyright 2002-2020 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -191,14 +191,6 @@ public final class WebHttpHandlerBuilder { // Fall back on default } - try { - builder.localeContextResolver( - context.getBean(LOCALE_CONTEXT_RESOLVER_BEAN_NAME, LocaleContextResolver.class)); - } - catch (NoSuchBeanDefinitionException ex) { - // Fall back on default - } - try { builder.forwardedHeaderTransformer( context.getBean(FORWARDED_HEADER_TRANSFORMER_BEAN_NAME, ForwardedHeaderTransformer.class));