From e0441a5bfb29083a532307ba2b1fd6d6d13944ba Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Sat, 28 Jun 2008 13:29:13 +0000 Subject: Import GNU Classpath (classpath-0_97_2-release). libjava/ 2008-06-28 Matthias Klose Import GNU Classpath (classpath-0_97_2-release). * Regenerate class and header files. * Regenerate auto* files. * gcj/javaprims.h: Define jobjectRefType. * jni.cc (_Jv_JNI_GetObjectRefType): New (stub only). (_Jv_JNIFunctions): Initialize GetObjectRefType. * gnu/classpath/jdwp/VMVirtualMachine.java, java/security/VMSecureRandom.java: Merge from classpath. * HACKING: Fix typo. * ChangeLog-2007: New file. * configure.ac: Set JAVAC, pass --disable-regen-headers to classpath. libjava/classpath/ 2008-06-28 Matthias Klose * m4/ac_prog_javac.m4: Disable check for JAVAC, when not configured with --enable-java-maintainer-mode. * aclocal.m4, configure: Regenerate. * native/jni/gstreamer-peer/Makefile.am: Do not link with libclasspathnative. * native/jni/gstreamer-peer/Makefile.in: Regenerate. * tools/Makefile.am, lib/Makefile.am: Use JAVAC for setting JCOMPILER, drop flags not understood by gcj. From-SVN: r137223 --- libjava/classpath/java/security/SecureClassLoader.java | 7 ++----- libjava/classpath/java/security/Security.java | 2 +- libjava/classpath/java/security/cert/CertificateFactory.java | 1 - libjava/classpath/java/security/spec/RSAKeyGenParameterSpec.java | 4 ++-- 4 files changed, 5 insertions(+), 9 deletions(-) (limited to 'libjava/classpath/java/security') diff --git a/libjava/classpath/java/security/SecureClassLoader.java b/libjava/classpath/java/security/SecureClassLoader.java index f683f9a..6e17300 100644 --- a/libjava/classpath/java/security/SecureClassLoader.java +++ b/libjava/classpath/java/security/SecureClassLoader.java @@ -37,8 +37,6 @@ exception statement from your version. */ package java.security; -import java.util.WeakHashMap; - import java.nio.ByteBuffer; import java.util.HashMap; @@ -113,7 +111,7 @@ public class SecureClassLoader extends ClassLoader { synchronized (protectionDomainCache) { - protectionDomain = (ProtectionDomain)protectionDomainCache.get(cs); + protectionDomain = protectionDomainCache.get(cs); } if (protectionDomain == null) @@ -122,8 +120,7 @@ public class SecureClassLoader extends ClassLoader = new ProtectionDomain(cs, getPermissions(cs), this, null); synchronized (protectionDomainCache) { - ProtectionDomain domain - = (ProtectionDomain)protectionDomainCache.get(cs); + ProtectionDomain domain = protectionDomainCache.get(cs); if (domain == null) protectionDomainCache.put(cs, protectionDomain); else diff --git a/libjava/classpath/java/security/Security.java b/libjava/classpath/java/security/Security.java index d3d2c1e..6b7b664 100644 --- a/libjava/classpath/java/security/Security.java +++ b/libjava/classpath/java/security/Security.java @@ -702,7 +702,7 @@ public final class Security return true; // assume value is a number. cehck for greater-than-or-equal - return (new Integer(val).intValue() >= new Integer(realVal).intValue()); + return (Integer.parseInt(val) >= Integer.parseInt(realVal)); } } diff --git a/libjava/classpath/java/security/cert/CertificateFactory.java b/libjava/classpath/java/security/cert/CertificateFactory.java index 8139c6e..d83b816 100644 --- a/libjava/classpath/java/security/cert/CertificateFactory.java +++ b/libjava/classpath/java/security/cert/CertificateFactory.java @@ -42,7 +42,6 @@ import gnu.java.security.Engine; import java.io.InputStream; import java.lang.reflect.InvocationTargetException; -import java.security.KeyStoreException; import java.security.NoSuchAlgorithmException; import java.security.NoSuchProviderException; import java.security.Provider; diff --git a/libjava/classpath/java/security/spec/RSAKeyGenParameterSpec.java b/libjava/classpath/java/security/spec/RSAKeyGenParameterSpec.java index 0df8dec..ad55111 100644 --- a/libjava/classpath/java/security/spec/RSAKeyGenParameterSpec.java +++ b/libjava/classpath/java/security/spec/RSAKeyGenParameterSpec.java @@ -55,12 +55,12 @@ public class RSAKeyGenParameterSpec implements AlgorithmParameterSpec /** Public Exponent F0 = 3 */ - public static final BigInteger F0 = new BigInteger("3"); + public static final BigInteger F0 = BigInteger.valueOf(3); /** Public Exponent F4 = 3 */ - public static final BigInteger F4 = new BigInteger("65537"); + public static final BigInteger F4 = BigInteger.valueOf(65537L); /** Create a new RSAKeyGenParameterSpec to store the RSA key's keysize -- cgit v1.1