Skip to content

Fix truncated battles on attempted thread stop #85

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

Merged
flemming-n-larsen merged 1 commit into from
May 18, 2026
+6 −6
Merged

Fix truncated battles on attempted thread stop #85

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions robocode.host/src/main/java/net/sf/robocode/host/security/RobotThreadManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,11 @@ public void start(IThreadManager threadManager) {
*/
public boolean waitForStop() {
boolean isAlive = false;

if (runThread != null && runThread.isAlive()) {
runThread.interrupt();
waitForStop(runThread);
isAlive = runThread.isAlive();
Thread thr = runThread; // forceStop() can set to null concurrently
if (thr != null && thr.isAlive()) {
thr.interrupt();
waitForStop(thr);
isAlive = thr.isAlive();
}

Thread[] threads = new Thread[100];
Expand All @@ -108,7 +108,7 @@ public boolean waitForStop() {
}

for (Thread thread : threads) {
if (thread != null && thread != runThread && thread.isAlive()) {
if (thread != null && thread != thr && thread.isAlive()) {
thread.interrupt();
waitForStop(thread);
isAlive |= thread.isAlive();
Expand Down