summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpaltherr <paltherr@epfl.ch>2003-03-31 14:01:23 +0000
committerpaltherr <paltherr@epfl.ch>2003-03-31 14:01:23 +0000
commit19da03df2012282675e1355ca6bf8f0750dcea1f (patch)
tree78029219f9f99f925852a1eed1a63532e2b7e728
parent379a56669bfde2ee08e8941f2a49ccb328fa3d64 (diff)
downloadscala-19da03df2012282675e1355ca6bf8f0750dcea1f.tar.gz
scala-19da03df2012282675e1355ca6bf8f0750dcea1f.tar.bz2
scala-19da03df2012282675e1355ca6bf8f0750dcea1f.zip
- Fixed implementation of "is" to handle null v...
- Fixed implementation of "is" to handle null values
-rw-r--r--sources/scala/tools/scalai/Evaluator.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/sources/scala/tools/scalai/Evaluator.java b/sources/scala/tools/scalai/Evaluator.java
index 25a0553843..3f46f343fe 100644
--- a/sources/scala/tools/scalai/Evaluator.java
+++ b/sources/scala/tools/scalai/Evaluator.java
@@ -178,6 +178,7 @@ public class Evaluator {
case IsScala(Code target, Symbol symbol):
Object object = evaluate(target);
+ if (object == null) return Boolean.FALSE;
Symbol actual = getScalaObject(object).template.getSymbol();
return new Boolean(actual.isSubClass(symbol));