*** empty log message ***

2 files changed, 5 insertions, 4 deletions

diff --git a/sources/scala/tools/scaladoc/SymbolTablePrinter.java b/sources/scala/tools/scaladoc/SymbolTablePrinter.java
index e8b4090e0a..72fd773519 100644
--- a/sources/scala/tools/scaladoc/SymbolTablePrinter.java
+++ b/sources/scala/tools/scaladoc/SymbolTablePrinter.java
@@ -577,7 +577,7 @@ public class SymbolTablePrinter extends scalac.symtab.SymbolTablePrinter {
      *
      * @param prefix
      */
-    public Type getTypeToPrintForPrefix0(Ty*pe prefix) {
+    public Type getTypeToPrintForPrefix0(Type prefix) {
         if (!global.debug) {
             if (prefix.symbol().kind == Kinds.NONE) return null;
             if (prefix.symbol().isRoot()) return null;
diff --git a/sources/scalac/symtab/classfile/UnPickle.java b/sources/scalac/symtab/classfile/UnPickle.java
index 68c2a99177..e4413be233 100644
--- a/sources/scalac/symtab/classfile/UnPickle.java
+++ b/sources/scalac/symtab/classfile/UnPickle.java
@@ -481,10 +481,11 @@ public class UnPickle implements Kinds, Modifiers, EntryTags, TypeTags {
 	    return new Float(Double.longBitsToDouble(readNumberRef()));
 	case UnboxedType(BOOLEAN):
 	    return new Boolean(readNumberRef() == 0 ? false : true);
-	case UnboxedType(STRING):
-	    return readNameRef().toString();
 	default:
-	    return new ApplicationError("bad constant base type: " + base);
+	    if (base.symbol() == Global.instance.definitions.JAVA_STRING_CLASS)
+		return readNameRef().toString();
+	    else
+		throw new ApplicationError("bad constant base type: " + base);
 	}
     }