From 0cbd39801459319899e08e930f5257c2ced61ddb Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 20 Feb 2001 18:05:57 +0000 Subject: ThreadGroup.java (activeCount): Only include threads which are alive. * java/lang/ThreadGroup.java (activeCount): Only include threads which are alive. (enumerate): Likewise. From-SVN: r39922 --- libjava/java/lang/ThreadGroup.java | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) (limited to 'libjava/java/lang') diff --git a/libjava/java/lang/ThreadGroup.java b/libjava/java/lang/ThreadGroup.java index cf1e717..e8b4446 100644 --- a/libjava/java/lang/ThreadGroup.java +++ b/libjava/java/lang/ThreadGroup.java @@ -1,5 +1,5 @@ /* java.lang.ThreadGroup - Copyright (C) 1998, 2000 Free Software Foundation, Inc. + Copyright (C) 1998, 2000, 2001 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -204,16 +204,21 @@ public class ThreadGroup * @return the number of active threads in this ThreadGroup and * its descendants. * @specnote it isn't clear what the definition of an "Active" thread is. - * Current JDKs regard all threads as active until they are - * finished, regardless of whether the thread has been started - * or not. We implement this behaviour. - * There is open JDC bug, + * Current JDKs regard a thread as active if has been + * started and not finished. We implement this behaviour. + * There is a JDC bug, * 4089701, regarding this issue. * */ public synchronized int activeCount() { - int total = threads.size(); + int total = 0; + for (int i = 0; i < threads.size(); ++i) + { + if (((Thread) threads.elementAt(i)).isAlive ()) + ++total; + } + for (int i=0; i < groups.size(); i++) { ThreadGroup g = (ThreadGroup) groups.elementAt(i); @@ -274,7 +279,11 @@ public class ThreadGroup { Enumeration e = threads.elements(); while (e.hasMoreElements() && next_index < list.length) - list[next_index++] = (Thread) e.nextElement(); + { + Thread t = (Thread) e.nextElement(); + if (t.isAlive ()) + list[next_index++] = t; + } if (recurse && next_index != list.length) { e = groups.elements(); -- cgit v1.1