summaryrefslogtreecommitdiff
path: root/sources
diff options
context:
space:
mode:
authormichelou <michelou@epfl.ch>2005-04-28 17:16:01 +0000
committermichelou <michelou@epfl.ch>2005-04-28 17:16:01 +0000
commit6d81466523463b6a7795e841a7cfdf7ad3e06356 (patch)
tree9d9129fe2714958bc858464ca5eaa842361d5f7a /sources
parent8cce5ad64a87303a516d2a0ee962f9d9dd947300 (diff)
downloadscala-6d81466523463b6a7795e841a7cfdf7ad3e06356.tar.gz
scala-6d81466523463b6a7795e841a7cfdf7ad3e06356.tar.bz2
scala-6d81466523463b6a7795e841a7cfdf7ad3e06356.zip
- added test guard before accessing constr.clazz.
Diffstat (limited to 'sources')
-rw-r--r--sources/scala/runtime/types/ScalaClassType.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/sources/scala/runtime/types/ScalaClassType.java b/sources/scala/runtime/types/ScalaClassType.java
index e8f0a984e0..d5380ad646 100644
--- a/sources/scala/runtime/types/ScalaClassType.java
+++ b/sources/scala/runtime/types/ScalaClassType.java
@@ -257,6 +257,8 @@ public class ScalaClassType extends ClassType {
// Enforces uniqueness of the instance when serializing and
// deserializing the same Scala type object many times.
private Object readResolve() {
+ if (constr.clazz == null)
+ return this; // TODO: check why clazz may be null
String fullName = constr.clazz.getName();
Class instClazz = constr.clazz;
if (constr.clazz.isInterface()) {