From 5dc20e687f0704e4828fee1db3e1da2350c2e613 Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Fri, 21 Sep 2012 10:37:24 +0400
Subject: [PATCH] Nullability fix for StringsJVM

---
 libraries/stdlib/src/kotlin/StringsJVM.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/stdlib/src/kotlin/StringsJVM.kt b/libraries/stdlib/src/kotlin/StringsJVM.kt
index c538fbc58b4..560847bccc4 100644
--- a/libraries/stdlib/src/kotlin/StringsJVM.kt
+++ b/libraries/stdlib/src/kotlin/StringsJVM.kt
@@ -60,7 +60,7 @@ public inline fun String(bytes : ByteArray, offset : Int, length : Int, charsetN
 
 public inline fun String(bytes : ByteArray, offset : Int, length : Int, charset : java.nio.charset.Charset) : String = java.lang.String(bytes, offset, length, charset) as String
 
-public inline fun String(bytes : ByteArray, charsetName : String?) : String = java.lang.String(bytes, charsetName) as String
+public inline fun String(bytes : ByteArray, charsetName : String) : String = java.lang.String(bytes, charsetName) as String
 
 public inline fun String(bytes : ByteArray, charset : java.nio.charset.Charset) : String = java.lang.String(bytes, charset) as String
 
@@ -78,7 +78,7 @@ public inline fun String.replaceFirst(regex : String, replacement : String) : St
 
 public inline fun String.charAt(index : Int) : Char = (this as java.lang.String).charAt(index)!!
 
-public inline fun String.split(regex : String, limit : Int) : Array<String?> = (this as java.lang.String).split(regex, limit)!!
+public inline fun String.split(regex : String, limit : Int) : Array<String> = (this as java.lang.String).split(regex, limit)
 
 public inline fun String.codePointAt(index : Int) : Int = (this as java.lang.String).codePointAt(index)!!