GH-3945: Fix not eligible for getting processed
#3947
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
garyrussell
suggested changes
Nov 15, 2022
| @@ -143,6 +143,15 @@ public final Object invoke(final MethodInvocation invocation) throws Throwable { | |||
| } | |||
| } | |||
|
|
|||
| private void initMessagingTemplateIfAny() { | |||
| if (this.templateInitialized.compareAndSet(false, true)) { | |||
There was a problem hiding this comment.
This is not thread safe - another thread could end up with a null channel resolver before the current thread assigns it.
Since the code under the condition is idempotent, it is ok for multiple threads to execute it. Set to true after the work is done.
There was a problem hiding this comment.
Ah! I see.
Yeah... I questioned myself why in other place we use boolean flag instead of this AtomicBoolean.
Thank you! 😄
Fixes spring-projects#3945 The `IntegrationManagementConfiguration` produces an `IntegrationManagementConfigurer` which is a `BeanPostProcessor`. According to Spring recommendation this kind of infrastructure beans must be declared as `static`. Due to an `implements ImportAware, EnvironmentAware` nature of the `IntegrationManagementConfiguration`, we cannot use `static @Bean` method. But since the `IntegrationManagementConfiguration` is not involved in any bean post-processing, it is safe to follow recommendation and mark it as a `@Role(BeanDefinition.ROLE_INFRASTRUCTURE)`. * Fix `MessagePublishingInterceptor` to initialize `MessagingTemplate` and `DestinationResolver` lazily * Fix `AbstractMethodAnnotationPostProcessor` to initialize `DestinationResolver` lazily **Cherry-pick to `5.5.x`**
…ionPostProcessor` instead of direct property access which might not be initialized yet * Use a plain `boolean` for `templateInitialized` in the `MessagePublishingInterceptor` to avoid skips in other thread where and move on with still not initialized properties
|
Cherry-pick is not clean - please back port. |
artembilan
added a commit
that referenced
this pull request
Nov 15, 2022
* GH-3945: Fix `not eligible for getting processed` Fixes #3945 The `IntegrationManagementConfiguration` produces an `IntegrationManagementConfigurer` which is a `BeanPostProcessor`. According to Spring recommendation this kind of infrastructure beans must be declared as `static`. Due to an `implements ImportAware, EnvironmentAware` nature of the `IntegrationManagementConfiguration`, we cannot use `static @Bean` method. But since the `IntegrationManagementConfiguration` is not involved in any bean post-processing, it is safe to follow recommendation and mark it as a `@Role(BeanDefinition.ROLE_INFRASTRUCTURE)`. * Fix `MessagePublishingInterceptor` to initialize `MessagingTemplate` and `DestinationResolver` lazily * Fix `AbstractMethodAnnotationPostProcessor` to initialize `DestinationResolver` lazily **Cherry-pick to `5.5.x`** * Use `getChannelResolver()` internally in the `AbstractMethodAnnotationPostProcessor` instead of direct property access which might not be initialized yet * Use a plain `boolean` for `templateInitialized` in the `MessagePublishingInterceptor` to avoid skips in other thread where and move on with still not initialized properties * Remove unused import * Fix `this.` prefix for `beanFactory` property reference # Conflicts: # spring-integration-core/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java
|
... and cherry-picked to |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #3945
The
IntegrationManagementConfigurationproduces anIntegrationManagementConfigurerwhich is aBeanPostProcessor. According to Spring recommendation this kind of infrastructure beans must be declared asstatic. Due to animplements ImportAware, EnvironmentAwarenature of theIntegrationManagementConfiguration, we cannot usestatic @Beanmethod.But since the
IntegrationManagementConfigurationis not involved in any bean post-processing, it is safe to follow recommendation and mark it as a@Role(BeanDefinition.ROLE_INFRASTRUCTURE).MessagePublishingInterceptorto initializeMessagingTemplateandDestinationResolverlazilyAbstractMethodAnnotationPostProcessorto initializeDestinationResolverlazilyCherry-pick to
5.5.x