- Hard coded the types of java.lang.Object and ...

- Hard coded the types of java.lang.Object and java.lang.String

1 files changed, 5 insertions, 4 deletions

diff --git a/sources/scalac/symtab/classfile/JavaTypeCreator.java b/sources/scalac/symtab/classfile/JavaTypeCreator.java
index c5fb665696..d01f1923e2 100644
--- a/sources/scalac/symtab/classfile/JavaTypeCreator.java
+++ b/sources/scalac/symtab/classfile/JavaTypeCreator.java
@@ -100,6 +100,10 @@ public class JavaTypeCreator implements JavaTypeFactory {
     }
 
     public Type classType(String classname) {
+	if (classname.equals("java.lang.Object"))
+	    return objectType();
+	if (classname.equals("java.lang.String"))
+	    return stringType();
         return classType(definitions.getClass(classname));
     }
 
@@ -121,10 +125,7 @@ public class JavaTypeCreator implements JavaTypeFactory {
         return new MethodType(args, restpe);
     }
     private Type objToAny(Type tp) {
-	if (tp.isSameAs(OBJECT_TYPE))
-	    return ANY_TYPE;
-	else
-	    return tp;
+	return tp.isSameAs(OBJECT_TYPE) ? ANY_TYPE : tp;
     }
 
     public Type packageType(Name packagename) {