From 1020ce5944edde4364baef4d371cd4f9b0dae721 Mon Sep 17 00:00:00 2001 From: doko Date: Sat, 28 Jun 2008 13:29:13 +0000 Subject: 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@137223 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/classpath/java/nio/charset/Charset.java | 2 +- libjava/classpath/java/nio/charset/CoderResult.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'libjava/classpath/java/nio/charset') diff --git a/libjava/classpath/java/nio/charset/Charset.java b/libjava/classpath/java/nio/charset/Charset.java index 556e4707eeb..924e005e65a 100644 --- a/libjava/classpath/java/nio/charset/Charset.java +++ b/libjava/classpath/java/nio/charset/Charset.java @@ -234,7 +234,7 @@ public abstract class Charset implements Comparable { for (Iterator i = providers[j].charsets(); i.hasNext(); ) { - Charset cs = (Charset) i.next(); + Charset cs = i.next(); charsets.put(cs.name(), cs); } } diff --git a/libjava/classpath/java/nio/charset/CoderResult.java b/libjava/classpath/java/nio/charset/CoderResult.java index 664215d9a68..304d9d70895 100644 --- a/libjava/classpath/java/nio/charset/CoderResult.java +++ b/libjava/classpath/java/nio/charset/CoderResult.java @@ -170,7 +170,7 @@ public class CoderResult if (length <= 0) throw new IllegalArgumentException ("Non-positive length"); - Integer len = new Integer (length); + Integer len = Integer.valueOf (length); CoderResult cr = null; Object o; if ((o = cache.get (len)) != null) -- cgit v1.2.3