This is an automated email from the ASF dual-hosted git repository.
afs pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git
The following commit(s) were added to refs/heads/main by this push:
new 7fdc253756 GH-3993: Renamed `BasicTask.isTerminated` to
`hasTerminated` due to visibility conflict with Thread.
7fdc253756 is described below
commit 7fdc253756624a251777bacdd5368f4f670ed683
Author: Claus Stadler <[email protected]>
AuthorDate: Tue Jun 16 12:47:31 2026 +0200
GH-3993: Renamed `BasicTask.isTerminated` to `hasTerminated` due to
visibility conflict with Thread.
---
.../apache/jena/fuseki/mod/geosparql/SpatialIndexerService.java | 4 ++--
.../apache/jena/geosparql/spatial/index/v2/SpatialIndexLib.java | 6 +++---
.../java/org/apache/jena/geosparql/spatial/task/BasicTask.java | 7 ++++++-
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git
a/jena-fuseki2/jena-fuseki-mod-geosparql/src/main/java/org/apache/jena/fuseki/mod/geosparql/SpatialIndexerService.java
b/jena-fuseki2/jena-fuseki-mod-geosparql/src/main/java/org/apache/jena/fuseki/mod/geosparql/SpatialIndexerService.java
index f9606a0330..d4d5caa771 100644
---
a/jena-fuseki2/jena-fuseki-mod-geosparql/src/main/java/org/apache/jena/fuseki/mod/geosparql/SpatialIndexerService.java
+++
b/jena-fuseki2/jena-fuseki-mod-geosparql/src/main/java/org/apache/jena/fuseki/mod/geosparql/SpatialIndexerService.java
@@ -433,8 +433,8 @@ public class SpatialIndexerService extends BaseActionREST {
status.addProperty("isIndexing", false);
time = 0;
} else {
- status.addProperty("isIndexing", !task.isTerminated());
- if (!task.isTerminated()) {
+ status.addProperty("isIndexing", !task.hasTerminated());
+ if (!task.hasTerminated()) {
status.addProperty("isAborting", task.isAborting());
time = !task.isAborting() ? task.getStartTime() :
task.getAbortTime();
} else {
diff --git
a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/index/v2/SpatialIndexLib.java
b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/index/v2/SpatialIndexLib.java
index a2b0fe9d69..39f67cea21 100644
---
a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/index/v2/SpatialIndexLib.java
+++
b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/index/v2/SpatialIndexLib.java
@@ -226,7 +226,7 @@ public class SpatialIndexLib {
BasicTask task =
cxt.compute(SpatialIndexConstants.symSpatialIndexTask, (key, priorTaskObj) -> {
BasicTask priorTask = (BasicTask)priorTaskObj;
- if (priorTask != null && !priorTask.isTerminated()) {
+ if (priorTask != null && !priorTask.hasTerminated()) {
throw new RuntimeException("A spatial indexing task is already
active for this dataset. Wait for completion or abort it.");
}
@@ -331,8 +331,8 @@ public class SpatialIndexLib {
public static BasicTask scheduleOnceCleanTask(DatasetGraph dsg,
TaskListener<BasicTask> taskListener) {
Context cxt = dsg.getContext();
BasicTask task =
cxt.compute(SpatialIndexConstants.symSpatialIndexTask, (key, priorTaskObj) -> {
- BasicTask priorTask = (BasicTask) priorTaskObj;
- if (priorTask != null && !priorTask.isTerminated()) {
+ BasicTask priorTask = (BasicTask)priorTaskObj;
+ if (priorTask != null && !priorTask.hasTerminated()) {
throw new RuntimeException("A spatial indexing task is already
active for this dataset. Wait for completion or abort it.");
}
diff --git
a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/task/BasicTask.java
b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/task/BasicTask.java
index 0a331fdda4..c08e2085b5 100644
---
a/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/task/BasicTask.java
+++
b/jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/task/BasicTask.java
@@ -53,7 +53,12 @@ public interface BasicTask extends Abortable {
// XXX this might be different from whether the task actually transitioned
into aborting state.
boolean isAborting();
- default boolean isTerminated() {
+ /**
+ * Whether the task has terminated.
+ *
+ * @implNote The original name {@code isTerminated} collided with the
package−private method in {@link Thread}.
+ */
+ default boolean hasTerminated() {
TaskState state = getTaskState();
return TaskState.TERMINATED.equals(state);
}