root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge branch '6.0.x' 

# Conflicts:
#	spring-core/src/main/java/org/springframework/core/task/SimpleAsyncTaskExecutor.java
This commit is contained in:
Juergen Hoeller 2023-07-27 21:48:42 +02:00
parent ce80637891 abbea39855
commit 376223c87d
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spring-context/src/main/java/org/springframework/scheduling/annotation/SchedulingConfigurer.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2021 the original author or authors. * Copyright 2002-2023 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -40,10 +40,10 @@ import org.springframework.scheduling.config.ScheduledTaskRegistrar;
public interface SchedulingConfigurer { public interface SchedulingConfigurer {
/** /**
* Callback allowing a {@link org.springframework.scheduling.TaskScheduler * Callback allowing a {@link org.springframework.scheduling.TaskScheduler}
* TaskScheduler} and specific {@link org.springframework.scheduling.config.Task Task} * and specific {@link org.springframework.scheduling.config.Task} instances
* instances to be registered against the given the {@link ScheduledTaskRegistrar}. * to be registered against the given the {@link ScheduledTaskRegistrar}.
* @param taskRegistrar the registrar to be configured. * @param taskRegistrar the registrar to be configured
*/ */
void configureTasks(ScheduledTaskRegistrar taskRegistrar); void configureTasks(ScheduledTaskRegistrar taskRegistrar);

7
spring-core/src/main/java/org/springframework/util/ConcurrencyThrottleSupport.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2018 the original author or authors. * Copyright 2002-2023 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -69,7 +69,7 @@ public abstract class ConcurrencyThrottleSupport implements Serializable {
/** /**
* Set the maximum number of concurrent access attempts allowed. * Set the maximum number of concurrent access attempts allowed.
* -1 indicates unbounded concurrency. * The default of -1 indicates no concurrency limit at all.
* <p>In principle, this limit can be changed at runtime, * <p>In principle, this limit can be changed at runtime,
* although it is generally designed as a config time setting. * although it is generally designed as a config time setting.
* <p>NOTE: Do not switch between -1 and any concrete limit at runtime, * <p>NOTE: Do not switch between -1 and any concrete limit at runtime,
@ -143,9 +143,10 @@ public abstract class ConcurrencyThrottleSupport implements Serializable {
*/ */
protected void afterAccess() { protected void afterAccess() {
if (this.concurrencyLimit >= 0) { if (this.concurrencyLimit >= 0) {
boolean debug = logger.isDebugEnabled();
synchronized (this.monitor) { synchronized (this.monitor) {
this.concurrencyCount--; this.concurrencyCount--;
if (logger.isDebugEnabled()) { if (debug) {
logger.debug("Returning from throttle at concurrency count " + this.concurrencyCount); logger.debug("Returning from throttle at concurrency count " + this.concurrencyCount);
} }
this.monitor.notify(); this.monitor.notify();