# HG changeset patch
# User attila
# Date 1365083742 -7200
# Node ID 73e1270b240c41c466e547e5e26ac9ed49b3a09d
# Parent  5eb1427b6a6db17f98e1cb6bba20c1320aee1284# Parent  18df6640e63f0e5d0a5ba4cd3b220bd2ef17a310
Merge

diff -r 5eb1427b6a6d -r 73e1270b240c src/jdk/nashorn/internal/objects/NativeString.java
--- a/src/jdk/nashorn/internal/objects/NativeString.java	Thu Apr 04 15:53:26 2013 +0200
+++ b/src/jdk/nashorn/internal/objects/NativeString.java	Thu Apr 04 15:55:42 2013 +0200
@@ -838,15 +838,13 @@
      */
     @Function(attributes = Attribute.NOT_ENUMERABLE)
     public static Object split(final Object self, final Object separator, final Object limit) {
-
         final String str = checkObjectToString(self);
+        final long lim = (limit == UNDEFINED) ? JSType.MAX_UINT : JSType.toUint32(limit);
 
         if (separator == UNDEFINED) {
             return new NativeArray(new Object[]{str});
         }
 
-        final long lim = (limit == UNDEFINED) ? JSType.MAX_UINT : JSType.toUint32(limit);
-
         if (separator instanceof NativeRegExp) {
             return ((NativeRegExp) separator).split(str, lim);
         }
diff -r 5eb1427b6a6d -r 73e1270b240c src/jdk/nashorn/internal/runtime/PropertyMap.java
--- a/src/jdk/nashorn/internal/runtime/PropertyMap.java	Thu Apr 04 15:53:26 2013 +0200
+++ b/src/jdk/nashorn/internal/runtime/PropertyMap.java	Thu Apr 04 15:55:42 2013 +0200
@@ -540,11 +540,13 @@
      * @param newMap   Modified {@link PropertyMap}.
      */
     private void addToHistory(final Property property, final PropertyMap newMap) {
-        if (history == null) {
-            history = new LinkedHashMap<>();
+        if (!properties.isEmpty()) {
+            if (history == null) {
+                history = new LinkedHashMap<>();
+            }
+
+            history.put(property, newMap);
         }
-
-        history.put(property, newMap);
     }
 
     /**
diff -r 5eb1427b6a6d -r 73e1270b240c test/script/basic/JDK-8011543.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/script/basic/JDK-8011543.js	Thu Apr 04 15:55:42 2013 +0200
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * JDK-8011543: "".split(undefined,{valueOf:function(){throw 2}}) does not throw exception
+ *
+ * @test
+ * @run
+ */
+
+try {
+    "".split(undefined,{
+        valueOf: function() {
+            throw 42;
+        }
+    });
+    fail("should have thrown 42");
+} catch (e) {
+    if (e != 42) {
+        fail("expected 42 to be thrown");
+    }
+}