Merge pull request #1378 from seonwooj0810/fix/issue-1367-fallback-factory-overwrite

ryanjbaxter · web-flow · commit e9693bca0d36 · 2026-05-27T10:12:13.000-04:00
Fix unconditional overwrite of resolved fallbackFactory in FeignClientsRegistrar
diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientsRegistrar.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientsRegistrar.java
@@ -241,7 +241,6 @@ private void eagerlyRegisterFeignClientBeanDefinition(String className, Map<Stri
 			definition.addPropertyValue("fallbackFactory", fallbackFactory instanceof Class ? fallbackFactory
 					: ClassUtils.resolveClassName(fallbackFactory.toString(), null));
 		}
-		definition.addPropertyValue("fallbackFactory", attributes.get("fallbackFactory"));
 		definition.setAutowireMode(AbstractBeanDefinition.AUTOWIRE_BY_TYPE);
 		definition.addPropertyValue("refreshableClient", isClientRefreshEnabled());
 		String[] qualifiers = getQualifiers(attributes);

Original file line number	Diff line number	Diff line change
`@@ -241,7 +241,6 @@ private void eagerlyRegisterFeignClientBeanDefinition(String className, Map<Stri`
`241`	`241`	`definition.addPropertyValue("fallbackFactory", fallbackFactory instanceof Class ? fallbackFactory`
`242`	`242`	`: ClassUtils.resolveClassName(fallbackFactory.toString(), null));`
`243`	`243`	`}`
`244`		`- definition.addPropertyValue("fallbackFactory", attributes.get("fallbackFactory"));`
`245`	`244`	`definition.setAutowireMode(AbstractBeanDefinition.AUTOWIRE_BY_TYPE);`
`246`	`245`	`definition.addPropertyValue("refreshableClient", isClientRefreshEnabled());`
`247`	`246`	`String[] qualifiers = getQualifiers(attributes);`