Merge branch '2.5.x' into 2.6.x

Closes gh-30847
pull/31143/head
Andy Wilkinson 3 years ago
commit b20a8bd778

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2021 the original author or authors. * Copyright 2012-2022 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.
@ -23,6 +23,7 @@ import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.CopyOnWriteArrayList;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir; import org.junit.jupiter.api.io.TempDir;
@ -116,7 +117,7 @@ class ClassPathFileSystemWatcherTests {
static class Listener implements ApplicationListener<ClassPathChangedEvent> { static class Listener implements ApplicationListener<ClassPathChangedEvent> {
private List<ClassPathChangedEvent> events = new ArrayList<>(); private List<ClassPathChangedEvent> events = new CopyOnWriteArrayList<>();
@Override @Override
public void onApplicationEvent(ClassPathChangedEvent event) { public void onApplicationEvent(ClassPathChangedEvent event) {

Loading…
Cancel
Save