Skip to content

Commit 9c16e15

Browse files
committed
Merge branch 'main' into ignite-26722
2 parents 234946a + 9580ceb commit 9c16e15

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

gradle/libs.versions.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ kryo = "5.6.2"
7676
bytebuddy = "1.17.8"
7777
mockServer = "5.15.0"
7878
archunit = "1.4.1"
79-
testkit = "1.13.4"
79+
testkit = "1.14.0"
8080
openapi = "4.10.0"
8181
autoService = "1.1.1"
8282
awaitility = "4.3.0"
@@ -89,7 +89,7 @@ tree-sitter-sql = "gh-pages-a"
8989
tree-sitter-hocon = "master-a"
9090
otel = "1.55.0"
9191
spring-boot = "3.5.6"
92-
spring-data = "3.5.4"
92+
spring-data = "3.5.5"
9393
testcontainers = "1.21.3"
9494
gradleToolingApi = "8.6"
9595
protobuf = "4.33.0"
@@ -100,7 +100,7 @@ japicmp = "0.24.2"
100100
pmdTool = "7.13.0"
101101
# NOTE: do not update checkstyle to 11.x.x+, because newer versions are not compatible with Java 11.
102102
checkstyleTool = "10.26.1"
103-
spotbugsTool = "4.9.6"
103+
spotbugsTool = "4.9.7"
104104

105105
[plugins]
106106
openapiGenerator = "org.openapi.generator:7.12.0"

modules/page-memory/src/main/java/org/apache/ignite/internal/pagememory/persistence/compaction/Compactor.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -357,12 +357,12 @@ public void cancel() {
357357
log.debug("Cancelling grid runnable: " + this);
358358
}
359359

360-
// Do not interrupt runner thread.
361-
isCancelled.set(true);
362-
363360
resume();
364361

365362
synchronized (mux) {
363+
// Do not interrupt runner thread.
364+
isCancelled.set(true);
365+
366366
mux.notifyAll();
367367
}
368368
}

0 commit comments

Comments
 (0)