diff --git a/samples/console.js b/samples/console.js new file mode 100644 index 0000000000000000000000000000000000000000..ba1fb93ff8f43b02b67eab9bf861928ab0b56dc5 --- /dev/null +++ b/samples/console.js @@ -0,0 +1,134 @@ +/* + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * - Neither the name of Oracle nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS + * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** + * Simple Web Console-like support for Nashorn. In addition to + * Web console object methods, this console add methods of + * java.io.Console as well. Note:not all web console methods are + * implemented but useful subset is implemented. + * + * See also: https://developer.mozilla.org/en/docs/Web/API/console + */ + + +if (typeof console == 'undefined') { + +(function() { + var LocalDateTime = Java.type("java.time.LocalDateTime"); + var System = Java.type("java.lang.System"); + var jconsole = System.console(); + + // add a new global variable called "console" + this.console = { + }; + + function addConsoleMethods() { + // expose methods of java.io.Console as an extension + var placeholder = "-*-"; + // put a placeholder for each name from java.lang.Object + var objMethods = Object.bindProperties({}, new java.lang.Object()); + for (var m in objMethods) { + console[m] = placeholder; + } + + // bind only the methods of java.io.Console + // This bind will skip java.lang.Object methods as console + // has properties of same name. + Object.bindProperties(console, jconsole); + + // Now, delete java.lang.Object methods + for (var m in console) { + if (console[m] == placeholder) { + delete console[m]; + } + } + } + + addConsoleMethods(); + + function consoleLog(type, msg) { + // print type of message, then time. + jconsole.format("%s [%s] ", type, LocalDateTime.now().toString()); + if (typeof msg == 'string') { + jconsole.format(msg + "\n", Array.prototype.slice.call(arguments, 2)); + } else { + // simple space separated values and newline at the end + var arr = Array.prototype.slice.call(arguments, 1); + jconsole.format("%s\n", arr.join(" ")); + } + } + + console.toString = function() "[object Console]"; + + // web console functions + + console.assert = function(expr) { + if (! expr) { + arguments[0] = "Assertion Failed:"; + consoleLog.apply(console, arguments); + // now, stack trace at the end + jconsole.format("%s\n", new Error().stack); + } + }; + + // dummy clear to avoid error! + console.clear = function() {}; + + var counter = { + get: function(label) { + if (! this[label]) { + return this[label] = 1; + } else { + return ++this[label]; + } + } + }; + + // counter + console.count = function(label) { + label = label? String(label) : ""; + jconsole.format("%s: %d\n",label, counter.get(label).intValue()); + } + + // logging + console.error = consoleLog.bind(jconsole, "ERROR"); + console.info = consoleLog.bind(jconsole, "INFO"); + console.log = console.info; + console.debug = console.log; + console.warn = consoleLog.bind(jconsole, "WARNING"); + + // print stack trace + console.trace = function() { + jconsole.format("%s\n", new Error().stack); + }; +})(); + +} diff --git a/samples/consoleuse.js b/samples/consoleuse.js new file mode 100644 index 0000000000000000000000000000000000000000..7927d70543e37c1d0fb5a3107ed9b905e861676b --- /dev/null +++ b/samples/consoleuse.js @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * - Neither the name of Oracle nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS + * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +load(__DIR__ + "console.js"); + +console.log("consoleuse.js started!"); + +function func() { + console.count("func"); +} + + +func(); +func(); +func(); +func(); + +// java.io.Console method +console.readPassword("passworld please: "); +console.error("Big error: %s!", "you revealed your password!"); +console.warn("You've done this %d times", 345); +console.assert(arguments.length != 0, "no arguments!"); + +// java.io.Console methods +var str = console.readLine("enter something: "); +console.printf("you entered: %s\n", str); + diff --git a/src/jdk/nashorn/internal/objects/NativeObject.java b/src/jdk/nashorn/internal/objects/NativeObject.java index 351e5a1948e40bf43a6d00323dc07a87a95725a8..7dc154e5fa7032d41f3e5530abce9c0bc5676290 100644 --- a/src/jdk/nashorn/internal/objects/NativeObject.java +++ b/src/jdk/nashorn/internal/objects/NativeObject.java @@ -765,7 +765,7 @@ public final class NativeObject { continue; } properties.add(AccessorProperty.create(methodName, Property.NOT_WRITABLE, getBoundBeanMethodGetter(source, - method), null)); + method), Lookup.EMPTY_SETTER)); } for(final String propertyName: propertyNames) { MethodHandle getter; diff --git a/test/script/basic/JDK-8080848.js b/test/script/basic/JDK-8080848.js new file mode 100644 index 0000000000000000000000000000000000000000..13a69cfc5944d06124eb693095e389755b926912 --- /dev/null +++ b/test/script/basic/JDK-8080848.js @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2015 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-8080848: delete of bound Java method property results in crash + * + * @test + * @run + */ + +var obj = Object.bindProperties({}, new java.io.File(".")); + +delete obj.wait; + +if (typeof obj.wait != 'undefined') { + throw new Error("obj.wait was not deleted"); +}