summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2011-12-22 22:06:46 +0100
committerMartin Odersky <odersky@gmail.com>2011-12-22 22:06:46 +0100
commit8fba3be263fc820c6e6645a5cafca0d405f4c96e (patch)
treedfbc180200d13a74554a00842d009180ab2da2d7
parent44d414eff7d4d5b730f3ab4ceb7692a1336d86a5 (diff)
downloadscala-8fba3be263fc820c6e6645a5cafca0d405f4c96e.tar.gz
scala-8fba3be263fc820c6e6645a5cafca0d405f4c96e.tar.bz2
scala-8fba3be263fc820c6e6645a5cafca0d405f4c96e.zip
Hardening of isJavaClass to survive IncompatibleClassChange errors.
-rw-r--r--src/compiler/scala/reflect/runtime/JavaToScala.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/reflect/runtime/JavaToScala.scala b/src/compiler/scala/reflect/runtime/JavaToScala.scala
index afd623b833..aa0572aceb 100644
--- a/src/compiler/scala/reflect/runtime/JavaToScala.scala
+++ b/src/compiler/scala/reflect/runtime/JavaToScala.scala
@@ -53,7 +53,7 @@ trait JavaToScala extends ConversionUtil { self: SymbolTable =>
javaClass(path)
true
} catch {
- case (_: ClassNotFoundException) | (_: NoClassDefFoundError) =>
+ case (_: ClassNotFoundException) | (_: NoClassDefFoundError) | (_: IncompatibleClassChangeError) =>
false
}