diff options
| author | Tom Tromey <tromey@redhat.com> | 2005-03-07 19:51:10 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2005-03-07 19:51:10 +0000 |
| commit | 088a1762744ea428d83cd5d91bed0e89103683ba (patch) | |
| tree | 4d4a23c0d21e6793017d163858877b7bbd8ac772 /libjava | |
| parent | 1de80b0e69dfca5d6cb8c0bdd7398699a4b05557 (diff) | |
| download | gcc-088a1762744ea428d83cd5d91bed0e89103683ba.zip gcc-088a1762744ea428d83cd5d91bed0e89103683ba.tar.gz gcc-088a1762744ea428d83cd5d91bed0e89103683ba.tar.bz2 | |
VMCompiler.java (md5Digest): New field.
* java/lang/VMCompiler.java (md5Digest): New field.
(compileClass): Clone md5Digest instead of looking up a new one.
From-SVN: r96039
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/java/lang/VMCompiler.java | 29 |
2 files changed, 32 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 696167f..f472968 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,10 @@ 2005-03-07 Tom Tromey <tromey@redhat.com> + * java/lang/VMCompiler.java (md5Digest): New field. + (compileClass): Clone md5Digest instead of looking up a new one. + +2005-03-07 Tom Tromey <tromey@redhat.com> + PR java/20215: * include/jvm.h (_Jv_Linker::find_field_helper): Updated. * link.cc (find_field_helper): Added 'type' argument. diff --git a/libjava/java/lang/VMCompiler.java b/libjava/java/lang/VMCompiler.java index b3f5560..784a816 100644 --- a/libjava/java/lang/VMCompiler.java +++ b/libjava/java/lang/VMCompiler.java @@ -79,6 +79,24 @@ final class VMCompiler private static Vector precompiledMapFiles; + // We create a single MD5 engine and then clone it whenever we want + // a new one. This is simpler than trying to find a new one each + // time, and it avoids potential deadlocks due to class loader + // oddities. + private static final MessageDigest md5Digest; + + static + { + try + { + md5Digest = MessageDigest.getInstance("MD5"); + } + catch (NoSuchAlgorithmException _) + { + md5Digest = null; + } + } + static { gcjJitCompiler = System.getProperty("gnu.gcj.jit.compiler"); @@ -175,11 +193,18 @@ final class VMCompiler try { - MessageDigest md = MessageDigest.getInstance("MD5"); + MessageDigest md = (MessageDigest) md5Digest.clone(); digest = md.digest(data); } - catch (NoSuchAlgorithmException _) + catch (CloneNotSupportedException _) + { + // Can't happen. + return null; + } + catch (NullPointerException _) { + // If md5Digest==null -- but really this should never happen + // either, since the MD5 digest is in libgcj. return null; } |