diff options
| author | mihaylov <mihaylov@epfl.ch> | 2004-04-27 09:47:07 +0000 |
|---|---|---|
| committer | mihaylov <mihaylov@epfl.ch> | 2004-04-27 09:47:07 +0000 |
| commit | 7ff8b2396fa0dc440e68f50be55bd4c2881ad217 (patch) | |
| tree | 039cd35eaec00070b52dbf0ab9fd6d18885ace73 | |
| parent | ef7e4e5a67636248e5b1ad101c56d828be146042 (diff) | |
| download | scala-7ff8b2396fa0dc440e68f50be55bd4c2881ad217.tar.gz scala-7ff8b2396fa0dc440e68f50be55bd4c2881ad217.tar.bz2 scala-7ff8b2396fa0dc440e68f50be55bd4c2881ad217.zip | |
- Improved the condition for when the unpicklin...
- Improved the condition for when the unpickling was successful,
namely at least one of the symbols (the class or the module) should be
initialized
| -rw-r--r-- | sources/scalac/symtab/classfile/UnPickle.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sources/scalac/symtab/classfile/UnPickle.java b/sources/scalac/symtab/classfile/UnPickle.java index a6d84b8e3c..cbad5db7d2 100644 --- a/sources/scalac/symtab/classfile/UnPickle.java +++ b/sources/scalac/symtab/classfile/UnPickle.java @@ -86,7 +86,7 @@ public class UnPickle implements Kinds, Modifiers, EntryTags, TypeTags { if (isSymbolEntry(i)) getSymbol(i); } if (global.debug) global.log("unpickled " + root + ":" + root.rawInfo());//debug - if (!root.isInitialized()) + if (!classroot.isInitialized() && !moduleroot.isInitialized()) throw new BadSignature(this, "it does not define " + root); // the isModule test is needed because moduleroot may become // the case class factory method of classroot |