From 8aa540d2f783474d1d2e06f16744bf67b9c1facc Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mark@gcc.gnu.org>
Date: Fri, 10 Mar 2006 21:46:48 +0000
Subject: Imported GNU Classpath 0.90

       Imported GNU Classpath 0.90
       * scripts/makemake.tcl: Set gnu/java/awt/peer/swing to ignore.
       * gnu/classpath/jdwp/VMFrame.java (SIZE): New constant.
       * java/lang/VMCompiler.java: Use gnu.java.security.hash.MD5.
       * java/lang/Math.java: New override file.
       * java/lang/Character.java: Merged from Classpath.
       (start, end): Now 'int's.
       (canonicalName): New field.
       (CANONICAL_NAME, NO_SPACES_NAME, CONSTANT_NAME): New constants.
       (UnicodeBlock): Added argument.
       (of): New overload.
       (forName): New method.
       Updated unicode blocks.
       (sets): Updated.
       * sources.am: Regenerated.
       * Makefile.in: Likewise.

From-SVN: r111942
---
 libjava/java/lang/VMCompiler.java | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'libjava/java/lang/VMCompiler.java')

diff --git a/libjava/java/lang/VMCompiler.java b/libjava/java/lang/VMCompiler.java
index 47920119f67..e6405f0bece 100644
--- a/libjava/java/lang/VMCompiler.java
+++ b/libjava/java/lang/VMCompiler.java
@@ -1,5 +1,5 @@
 /* VMClassLoader.java -- Reference implementation of compiler interface
-   Copyright (C) 2004, 2005 Free Software Foundation
+   Copyright (C) 2004, 2005, 2006 Free Software Foundation
 
 This file is part of GNU Classpath.
 
@@ -50,6 +50,7 @@ import java.util.StringTokenizer;
 import java.util.Vector;
 import gnu.gcj.runtime.SharedLibHelper;
 import gnu.gcj.runtime.PersistentByteMap;
+import gnu.java.security.hash.MD5;
 
 /**
  * This class is just a per-VM reflection of java.lang.Compiler.
@@ -90,8 +91,8 @@ final class VMCompiler
   // interpreted bytecode -- before we're able to use this class to
   // load precompiled classes.
 
-  private static final MessageDigest md5Digest
-    = new gnu.java.security.provider.MD5();
+  private static final MD5 md5Digest
+    = new gnu.java.security.hash.MD5();
 
   static
   {
@@ -193,8 +194,9 @@ final class VMCompiler
 
     try
       {
-	MessageDigest md = (MessageDigest) md5Digest.clone();
-	digest = md.digest(data);
+	MD5 md = (MD5) md5Digest.clone();
+	md.update(data);
+	digest = md.digest();
       }
     catch (CloneNotSupportedException _)
       {
-- 
cgit v1.2.3