From 8b023b17c948bb180794a23207903718404e2cca Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Fri, 9 Aug 2019 14:53:54 +0200 Subject: [PATCH] Polish contribution See gh-23435 --- .../support/ApplicationContextAwareProcessor.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/spring-context/src/main/java/org/springframework/context/support/ApplicationContextAwareProcessor.java b/spring-context/src/main/java/org/springframework/context/support/ApplicationContextAwareProcessor.java index 4847f31248..c6d856f16d 100644 --- a/spring-context/src/main/java/org/springframework/context/support/ApplicationContextAwareProcessor.java +++ b/spring-context/src/main/java/org/springframework/context/support/ApplicationContextAwareProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2019 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. @@ -76,8 +76,7 @@ class ApplicationContextAwareProcessor implements BeanPostProcessor { @Override @Nullable - public Object postProcessBeforeInitialization(final Object bean, String beanName) throws BeansException { - + public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException { if (!(bean instanceof EnvironmentAware || bean instanceof EmbeddedValueResolverAware || bean instanceof ResourceLoaderAware || bean instanceof ApplicationEventPublisherAware || bean instanceof MessageSourceAware || bean instanceof ApplicationContextAware)){ @@ -86,7 +85,7 @@ class ApplicationContextAwareProcessor implements BeanPostProcessor { AccessControlContext acc = null; - if (System.getSecurityManager() != null ) { + if (System.getSecurityManager() != null) { acc = this.applicationContext.getBeanFactory().getAccessControlContext(); } @@ -126,9 +125,4 @@ class ApplicationContextAwareProcessor implements BeanPostProcessor { } } - @Override - public Object postProcessAfterInitialization(Object bean, String beanName) { - return bean; - } - } -- GitLab