Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use Threadlocal.remove() instead of Threadlocal.set(null) #4601

Closed
wants to merge 2 commits into from
Closed

Use Threadlocal.remove() instead of Threadlocal.set(null) #4601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2f6b0a
Remove unnecessary ThreadLocal.set(null) in JobFlowExecutor constructor
Seungpang May 22, 2024
5df778d
Use Threadlocal.remove() instead of Threadlocal.set(null)
Seungpang May 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/JobFlowExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2006-2022 the original author or authors.
* Copyright 2006-2024 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.
Expand Down Expand Up @@ -35,6 +35,7 @@
* @author Dave Syer
* @author Michael Minella
* @author Mahmoud Ben Hassine
* @author Seungrae Kim
*
*/
public class JobFlowExecutor implements FlowExecutor {
Expand All @@ -58,7 +59,6 @@ public JobFlowExecutor(JobRepository jobRepository, StepHandler stepHandler, Job
this.jobRepository = jobRepository;
this.stepHandler = stepHandler;
this.execution = execution;
stepExecutionHolder.set(null);
}

@Override
Expand Down Expand Up @@ -118,7 +118,7 @@ public StepExecution getStepExecution() {

@Override
public void close(FlowExecution result) {
stepExecutionHolder.set(null);
stepExecutionHolder.remove();
}

@Override
Expand Down
5 changes: 3 additions & 2 deletions spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ChunkMonitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2006-2023 the original author or authors.
* Copyright 2006-2024 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.
Expand Down Expand Up @@ -32,6 +32,7 @@
*
* @author Dave Syer
* @author Mahmoud Ben Hassine
* @author Seungrae Kim
* @since 2.0
*/
public class ChunkMonitor extends ItemStreamSupport {
Expand Down Expand Up @@ -104,7 +105,7 @@ public void setChunkSize(int chunkSize) {
@Override
public void close() throws ItemStreamException {
super.close();
holder.set(null);
holder.remove();
if (streamsRegistered) {
stream.close();
}
Expand Down
7 changes: 4 additions & 3 deletions .../src/main/java/org/springframework/batch/repeat/support/RepeatSynchronizationManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2006-2007 the original author or authors.
* Copyright 2006-2024 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.
Expand Down Expand Up @@ -30,6 +30,7 @@
* {@link RepeatOperations} implementations.
*
* @author Dave Syer
* @author Seungrae Kim
*
*/
public final class RepeatSynchronizationManager {
Expand Down Expand Up @@ -70,7 +71,7 @@ public static void setCompleteOnly() {
*/
public static RepeatContext register(RepeatContext context) {
RepeatContext oldSession = getContext();
RepeatSynchronizationManager.contextHolder.set(context);
contextHolder.set(context);
return oldSession;
}

Expand All @@ -81,7 +82,7 @@ public static RepeatContext register(RepeatContext context) {
*/
public static RepeatContext clear() {
RepeatContext context = getContext();
RepeatSynchronizationManager.contextHolder.set(null);
contextHolder.remove();
return context;
}

Expand Down