OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

VMCompiler.java (compileClass): Ignore UnknownError.

Browse Source 
* java/lang/VMCompiler.java (compileClass): Ignore UnknownError.
	* gnu/gcj/runtime/natSharedLibLoader.cc (finalize): Only dlclose
	if 'handler' is valid.

From-SVN: r93927
This commit is contained in:
Tom Tromey 2005-01-19 23:56:27 +00:00 committed by Tom Tromey
parent 4366cf6d6f
commit af84b3d056
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libjava/ChangeLog
View File

@ -1,3 +1,9 @@
2005-01-19 Tom Tromey <tromey@redhat.com>
* java/lang/VMCompiler.java (compileClass): Ignore UnknownError.
* gnu/gcj/runtime/natSharedLibLoader.cc (finalize): Only dlclose
if 'handler' is valid.
2005-01-17 Tom Tromey <tromey@redhat.com>
* java/text/MessageFormat.java (scanString): Changed how quoting

5
libjava/gnu/gcj/runtime/natSharedLibLoader.cc
View File

@ -1,6 +1,6 @@
// natSharedLibLoader.cc - Implementation of SharedLibHelper native methods.
/* Copyright (C) 2001, 2003, 2004 Free Software Foundation
/* Copyright (C) 2001, 2003, 2004, 2005 Free Software Foundation
This file is part of libgcj.
@ -122,7 +122,8 @@ gnu::gcj::runtime::SharedLibHelper::finalize()
{
_Jv_FreeCoreChain ((_Jv_core_chain *) core_chain);
#ifdef HAVE_DLOPEN
dlclose (handler);
if (handler)
dlclose (handler);
#endif
}

7
libjava/java/lang/VMCompiler.java
View File

@ -1,5 +1,5 @@
/* VMClassLoader.java -- Reference implementation of compiler interface
Copyright (C) 2004 Free Software Foundation
Copyright (C) 2004, 2005 Free Software Foundation
This file is part of GNU Classpath.
@ -202,6 +202,11 @@ final class VMCompiler
catch (Exception _)
{
}
catch (UnknownError _)
{
// SharedLibHelper will throw UnknownError if the dlopen
// fails for some reason. We ignore it and continue on.
}
}
if (! useCompiler || ! canUseCompiler)