catch clause parameter is always not null

src/org/jetbrains/jet/j2k/Converter.kt

@@ -418,10 +418,10 @@ public open class Converter() {
         return parameters.map { parameterToParameter(it!!) }
     }
 
-    public open fun parameterToParameter(parameter: PsiParameter): Parameter {
+    public open fun parameterToParameter(parameter: PsiParameter, forceNotNull: Boolean = false): Parameter {
         return Parameter(Identifier(parameter.getName()!!),
                 typeToType(parameter.getType(),
-                        isAnnotatedAsNotNull(parameter.getModifierList())), true)
+                        forceNotNull || isAnnotatedAsNotNull(parameter.getModifierList())), true)
     }
 
     public open fun argumentsToExpressionList(expression: PsiCallExpression): List<Expression> {

src/org/jetbrains/jet/j2k/visitors/StatementVisitor.kt

@@ -188,7 +188,7 @@ public open class StatementVisitor(converter: Converter): ElementVisitor(convert
         val catchBlocks = statement?.getCatchBlocks()!!
         val catchBlockParameters = statement?.getCatchBlockParameters()!!
         for (i in 0..catchBlocks.size - 1) {
-            catches.add(CatchStatement(getConverter().parameterToParameter(catchBlockParameters[i]!!),
+            catches.add(CatchStatement(getConverter().parameterToParameter(catchBlockParameters[i]!!, true),
                     getConverter().blockToBlock(catchBlocks[i], true)))
         }
         myResult = TryStatement(getConverter().blockToBlock(statement?.getTryBlock(), true),

tests/testData/ast/tryStatement/statement/commonCaseForTryStatement.kt

@@ -2,10 +2,10 @@ try
 {
 callMethod(params)
 }
-catch (e : Exception?) {
+catch (e : Exception) {
 println(1)
 }
-catch (e : IOException?) {
+catch (e : IOException) {
 println(0)
 }
 finally

tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithEmptyFinally.kt

@@ -1,10 +1,10 @@
 try
 {
 }
-catch (e : Exception?) {
+catch (e : Exception) {
 println(1)
 }
-catch (e : IOException?) {
+catch (e : IOException) {
 println(0)
 }
 finally

tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithFinally.kt

@@ -1,10 +1,10 @@
 try
 {
 }
-catch (e : Exception?) {
+catch (e : Exception) {
 println(1)
 }
-catch (e : IOException?) {
+catch (e : IOException) {
 println(0)
 }
 finally

tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithoutFinally.kt

@@ -1,9 +1,9 @@
 try
 {
 }
-catch (e : Exception?) {
+catch (e : Exception) {
 println(1)
 }
-catch (e : IOException?) {
+catch (e : IOException) {
 println(0)
 }