fixes

Author: hmottestad

core/http/client/src/main/java/org/eclipse/rdf4j/http/client/QueryCircuitBreakerHandle.java

@@ -133,7 +133,7 @@ boolean requestCancel(QueryPressureState state, String reason) {
 		cancellationReason = reason;
 
 		Thread activeWorker = workerThread;
-		if (activeWorker != null) {
+		if (activeWorker != null && activeWorker != Thread.currentThread()) {
 			activeWorker.interrupt();
 		}
 

core/http/client/src/test/java/org/eclipse/rdf4j/http/client/QueryCircuitBreakerTest.java

@@ -117,6 +117,22 @@ void shouldDisableHeavyOperatorExecutionOnlyWhileCritical() throws Exception {
 		assertTrue(readHeavyOperatorExecutionEnabled());
 	}
 
+	@Test
+	void shouldNotLeaveCurrentThreadInterruptedWhenSelfCancelling() {
+		QueryCircuitBreakerHandle handle = new QueryCircuitBreakerHandle("self-cancel",
+				QueryCircuitBreakerHandle.Source.SERVER, "repo", "query", 0L, null);
+
+		try {
+			handle.attach(Thread.currentThread(), null);
+
+			assertTrue(handle.requestCancel(QueryPressureState.CRITICAL, "self-cancel"));
+			assertFalse(Thread.currentThread().isInterrupted());
+		} finally {
+			Thread.interrupted();
+			handle.finish();
+		}
+	}
+
 	@Test
 	void shouldIgnoreCheckpointStrideOnlyAtHighOrAbove() throws Exception {
 		PropertiesScope properties = new PropertiesScope()