* java/lang/VMClassLoader.java (getPrimitiveClass): Return correct

	type.

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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 56d89c8..a146eb2 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-24  Tom Tromey  <tromey@redhat.com>
+
+       * java/lang/VMClassLoader.java (getPrimitiveClass): Return correct
+       type.
+

 2001-07-23  Tom Tromey  <tromey@redhat.com>
 
        * gcj/javaprims.h: Rebuilt class list.
 2001-07-23  Tom Tromey  <tromey@redhat.com>
 
        * gcj/javaprims.h: Rebuilt class list.

diff --git a/libjava/java/lang/VMClassLoader.java b/libjava/java/lang/VMClassLoader.java
index de0db88..dcfec05 100644 (file)
--- a/libjava/java/lang/VMClassLoader.java
+++ b/libjava/java/lang/VMClassLoader.java
@@ -65,21 +65,21 @@ class VMClassLoader {
     if ("int".equals (type))
       return int.class;
     else if ("long".equals (type))
     if ("int".equals (type))
       return int.class;
     else if ("long".equals (type))

-      return int.class;
+      return long.class;

     else if ("boolean".equals (type))
     else if ("boolean".equals (type))

-      return int.class;
+      return boolean.class;

     else if ("short".equals (type))
     else if ("short".equals (type))

-      return int.class;
+      return short.class;

     else if ("char".equals (type))
     else if ("char".equals (type))

-      return int.class;
+      return char.class;

     else if ("byte".equals (type))
     else if ("byte".equals (type))

-      return int.class;
+      return byte.class;

     else if ("float".equals (type))
     else if ("float".equals (type))

-      return int.class;
+      return float.class;

     else if ("double".equals (type))
     else if ("double".equals (type))

-      return int.class;
+      return double.class;

     else if ("void".equals (type))
     else if ("void".equals (type))

-      return int.class;
+      return void.class;

     return null;
   }
 }
     return null;
   }
 }