[kaffe] CVS kaffe (guilhem): Compilation fix.

Kaffe CVS Kaffe Mailing List <kaffe@kaffe.org>
Wed Dec 31 01:55:03 2003


PatchSet 4252 
Date: 2003/12/31 09:52:10
Author: guilhem
Branch: HEAD
Tag: (none) 
Log:
Compilation fix.

Members: 
	ChangeLog:1.1839->1.1840 
	libraries/javalib/java/io/ObjectStreamClass.java:1.17->1.18 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.1839 kaffe/ChangeLog:1.1840
--- kaffe/ChangeLog:1.1839	Wed Dec 31 09:32:55 2003
+++ kaffe/ChangeLog	Wed Dec 31 09:52:10 2003
@@ -1,6 +1,11 @@
 2003-12-31  Guilhem Lavaux <guilhem@kaffe.org>
 
-	* libraries/javlaib/java/io/ObjectStreamClass.java,
+	* libraries/javalib/java/io/ObjectStreamClass.java
+	(getClassUID): Commented out again GNU security provider.
+
+2003-12-31  Guilhem Lavaux <guilhem@kaffe.org>
+
+	* libraries/javalib/java/io/ObjectStreamClass.java,
 	libraries/javalib/gnu/java/net/protocol/http/Connection.java,
 	libraries/javalib/java/net/URLConnection.java,
 	libraries/javalib/java/text/CollationElementIterator.java,
Index: kaffe/libraries/javalib/java/io/ObjectStreamClass.java
diff -u kaffe/libraries/javalib/java/io/ObjectStreamClass.java:1.17 kaffe/libraries/javalib/java/io/ObjectStreamClass.java:1.18
--- kaffe/libraries/javalib/java/io/ObjectStreamClass.java:1.17	Wed Dec 31 09:32:17 2003
+++ kaffe/libraries/javalib/java/io/ObjectStreamClass.java	Wed Dec 31 09:52:12 2003
@@ -55,7 +55,7 @@
 import java.util.Vector;
 import gnu.java.io.NullOutputStream;
 import gnu.java.lang.reflect.TypeSignature;
-import gnu.java.security.provider.Gnu;
+//import gnu.java.security.provider.Gnu;
 
 
 public class ObjectStreamClass implements Serializable
@@ -598,9 +598,10 @@
 	catch (NoSuchAlgorithmException e)
 	  {
 	    // If a provider already provides SHA, use it; otherwise, use this.
-	    Gnu gnuProvider = new Gnu();
-	    Security.addProvider(gnuProvider);
-	    md = MessageDigest.getInstance("SHA");
+	    //Gnu gnuProvider = new Gnu();
+	    //Security.addProvider(gnuProvider);
+	    //md = MessageDigest.getInstance("SHA");
+	    throw e;
 	  }
 
 	DigestOutputStream digest_out =