* java/lang/VMCompiler.java (md5Digest): New field.

	(compileClass): Clone md5Digest instead of looking up a new one.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@96039 138bc75d-0d04-0410-961f-82ee72b054a4

2 files changed, 32 insertions, 2 deletions

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 696167fade8..f4729686af4 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 b3f55603487..784a816c59c 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;
       }