summaryrefslogtreecommitdiff
path: root/src/compiler
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2011-12-22 22:06:46 +0100
committerPaul Phillips <paulp@improving.org>2011-12-22 19:32:54 -0800
commit8ce9494d60ac5e5dd41690b82105628972142849 (patch)
treedfbc180200d13a74554a00842d009180ab2da2d7 /src/compiler
parent7d3ec837a3883e1e79700ee7c8fe6ab3f7bbd73c (diff)
downloadscala-8ce9494d60ac5e5dd41690b82105628972142849.tar.gz
scala-8ce9494d60ac5e5dd41690b82105628972142849.tar.bz2
scala-8ce9494d60ac5e5dd41690b82105628972142849.zip
Hardening of isJavaClass.
To survive IncompatibleClassChange errors.
Diffstat (limited to 'src/compiler')
-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
}