diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaTypeTransformer.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaTypeTransformer.java index b79628b9ed5..4e555446b08 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaTypeTransformer.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaTypeTransformer.java @@ -207,7 +207,7 @@ public class JavaTypeTransformer { classTypesMap.put("java.lang.Object", JetStandardClasses.getNullableAnyType()); classTypesMap.put("java.lang.String", standardLibrary.getNullableStringType()); classTypesMap.put("java.lang.CharSequence", standardLibrary.getNullableCharSequenceType()); - classTypesMap.put("java.lang.Throwable", standardLibrary.getThrowableType()); + classTypesMap.put("java.lang.Throwable", standardLibrary.getNullableThrowableType()); } return classTypesMap; } diff --git a/compiler/testData/readJavaBinaryClass/MyException.java b/compiler/testData/readJavaBinaryClass/MyException.java new file mode 100644 index 00000000000..10e5a46bbfc --- /dev/null +++ b/compiler/testData/readJavaBinaryClass/MyException.java @@ -0,0 +1,7 @@ +// http://youtrack.jetbrains.com/issue/KT-1536 + +package test; + +class MyException { + MyException(String message, Throwable cause) {} +} diff --git a/compiler/testData/readJavaBinaryClass/MyException.kt b/compiler/testData/readJavaBinaryClass/MyException.kt new file mode 100644 index 00000000000..feb67c45c86 --- /dev/null +++ b/compiler/testData/readJavaBinaryClass/MyException.kt @@ -0,0 +1,3 @@ +package test + +open class MyException(p0: String?, p1: Throwable?) diff --git a/compiler/testData/readJavaBinaryClass/MyException.txt b/compiler/testData/readJavaBinaryClass/MyException.txt new file mode 100644 index 00000000000..703a2cc262e --- /dev/null +++ b/compiler/testData/readJavaBinaryClass/MyException.txt @@ -0,0 +1,5 @@ +namespace test + +open class test.MyException : jet.Any { + final /*constructor*/ fun (/*0*/ p0: jet.String?, /*1*/ p1: jet.Throwable?): test.MyException +}