Spring/spring-session-data-geode
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix bug in Exception handling when resolving the SpringSessionGemFireConfigurer to properly handle the NoUniqueBeanDefinitionException.

Browse Source
This commit is contained in:
John Blum
2018-08-10 19:58:18 -07:00
parent 81d51d89d6
commit 9a2f149aec
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/GemFireHttpSessionConfiguration.java
View File

@@ -36,6 +36,7 @@ import org.apache.geode.pdx.PdxSerializer;
import org.springframework.beans.BeansException; import org.springframework.beans.BeansException;
import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.beans.factory.NoSuchBeanDefinitionException;
import org.springframework.beans.factory.NoUniqueBeanDefinitionException;
import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.config.BeanPostProcessor; import org.springframework.beans.factory.config.BeanPostProcessor;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
@@ -423,7 +424,7 @@ public class GemFireHttpSessionConfiguration extends AbstractGemFireHttpSessionC
} }
catch (BeansException cause) { catch (BeansException cause) {
if (cause instanceof NoSuchBeanDefinitionException) { if (isCauseBecauseNoSpringSessionGemFireConfigurerPresent(cause)) {
return Optional.empty(); return Optional.empty();
} }
@@ -431,6 +432,10 @@ public class GemFireHttpSessionConfiguration extends AbstractGemFireHttpSessionC
} }
} }
private boolean isCauseBecauseNoSpringSessionGemFireConfigurerPresent(Exception cause) {
return (!(cause instanceof NoUniqueBeanDefinitionException) && cause instanceof NoSuchBeanDefinitionException);
}
private void applySpringSessionGemFireConfigurer() { private void applySpringSessionGemFireConfigurer() {
resolveSpringSessionGemFireConfigurer().ifPresent(configurer -> { resolveSpringSessionGemFireConfigurer().ifPresent(configurer -> {