Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GH-3469 New Sonar smell & volatile busyWaitMillis

Browse Source 
Fixes https://github.com/spring-projects/spring-integration/issues/3469

* Fix new Sonar smells
* Mark `LockRegistryLeaderInitiator.busyWaitMillis` as `volatile`
so runtime changes (e.g. `RedisLockRegistryLeaderInitiatorTests`)
will make an immediate effect
This commit is contained in:
Artem Bilan
2021-01-21 14:55:14 -05:00
parent 58ce578a10
commit 8763c95622
17 changed files with 121 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spring-integration-test-support/src/main/java/org/springframework/integration/test/util/TestUtils.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2021 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.
@@ -119,7 +119,7 @@ public abstract class TestUtils {
public static TestApplicationContext createTestApplicationContext() {
TestApplicationContext context = new TestApplicationContext();
ErrorHandler errorHandler = new MessagePublishingErrorHandler(context);
ThreadPoolTaskScheduler scheduler = createTaskScheduler(10);
ThreadPoolTaskScheduler scheduler = createTaskScheduler(10); // NOSONAR
scheduler.setErrorHandler(errorHandler);
registerBean("taskScheduler", scheduler, context);
registerBean("integrationConversionService", new DefaultFormattingConversionService(), context);
@@ -255,15 +255,13 @@ public abstract class TestUtils {
boolean sent = false;
if (errorChannel != null) {
try {
sent = errorChannel.send(new ErrorMessage(throwable), 10000);
sent = errorChannel.send(new ErrorMessage(throwable), 10000); // NOSONAR
}
catch (Throwable errorDeliveryError) { //NOSONAR
// message will be logged only
if (logger.isWarnEnabled()) {
logger.warn("Error message was not delivered.", errorDeliveryError);
}
if (errorDeliveryError instanceof Error) {
throw ((Error) errorDeliveryError); // NOSONAR
logger.warn("Error message was not delivered.", errorDeliveryError);
if (errorDeliveryError instanceof Error) { // NOSONAR
throw ((Error) errorDeliveryError);
}
}
}