diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-01-05 17:35:20 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-01-05 17:35:20 +0000 |
| commit | 734ef6299ca3351ff45f6a5536cb94859304a4aa (patch) | |
| tree | fd2db057908c13ffddfda78f05009fcd2f14cb79 /libjava | |
| parent | 4f7e36ee68ea1ccd6065f94e767d98a270363f0f (diff) | |
| download | ppe42-gcc-734ef6299ca3351ff45f6a5536cb94859304a4aa.tar.gz ppe42-gcc-734ef6299ca3351ff45f6a5536cb94859304a4aa.zip | |
* java/lang/natPosixProcess.cc (reap): Ignore unknown children.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@109383 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 4 | ||||
| -rw-r--r-- | libjava/java/lang/natPosixProcess.cc | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 0ee3841b9ed..a2cc01e4ad7 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,7 @@ +2006-01-05 Tom Tromey <tromey@redhat.com> + + * java/lang/natPosixProcess.cc (reap): Ignore unknown children. + 2006-01-04 Krister Walfridsson <cato@df.lth.se> * posix-threads.cc (_Jv_InitThreads): #ifdef PTHREAD_STACK_MIN diff --git a/libjava/java/lang/natPosixProcess.cc b/libjava/java/lang/natPosixProcess.cc index 9a6c3218d4d..94344fc8e61 100644 --- a/libjava/java/lang/natPosixProcess.cc +++ b/libjava/java/lang/natPosixProcess.cc @@ -1,6 +1,6 @@ // natPosixProcess.cc - Native side of POSIX process code. -/* Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, 2005 Free Software Foundation +/* Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, 2005, 2006 Free Software Foundation This file is part of libgcj. @@ -170,6 +170,8 @@ jboolean java::lang::ConcreteProcess$ProcessManager::reap () // Look up the process in our pid map. ConcreteProcess * process = removeProcessFromMap ((jlong) pid); + // Note that if process==NULL, then we have an unknown child. + // This is not common, but can happen, and isn't an error. if (process) { JvSynchronize sync (process); @@ -178,11 +180,6 @@ jboolean java::lang::ConcreteProcess$ProcessManager::reap () process->processTerminationCleanup(); process->notifyAll (); } - else - { - // Unknown child. How did this happen? - fprintf (stderr, "Reaped unknown child pid = %ld\n", (long) pid); - } } error: |
