# HG changeset patch # User Jaroslav Tulach # Date 1358769185 -3600 # Node ID dc07c9001184bd6f9b0b3f3eab69e6ce8057e318 # Parent 910c043eac22395708f6086ad2421106e7c7ddf1 String.equals(null) should not yield exception diff -r 910c043eac22 -r dc07c9001184 emul/src/main/java/java/lang/String.java --- a/emul/src/main/java/java/lang/String.java Sun Jan 20 21:02:19 2013 +0100 +++ b/emul/src/main/java/java/lang/String.java Mon Jan 21 12:53:05 2013 +0100 @@ -994,7 +994,7 @@ * @see #equalsIgnoreCase(String) */ @JavaScriptBody(args = { "obj" }, body = - "return obj.$instOf_java_lang_String && " + "return obj != null && obj.$instOf_java_lang_String && " + "this.toString() === obj.toString();" ) public boolean equals(Object anObject) { diff -r 910c043eac22 -r dc07c9001184 vmtest/src/test/java/org/apidesign/bck2brwsr/tck/CompareStringsTest.java --- a/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/CompareStringsTest.java Sun Jan 20 21:02:19 2013 +0100 +++ b/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/CompareStringsTest.java Mon Jan 21 12:53:05 2013 +0100 @@ -42,6 +42,10 @@ return String.class.cast(o); } + @Compare public boolean equalToNull() { + return "Ahoj".equals(null); + } + @Compare public static Object compareURLs() throws MalformedURLException { return new URL("http://apidesign.org:8080/wiki/").toExternalForm().toString(); }