# HG changeset patch # User lagergren # Date 1417168974 -3600 # Node ID 32fa6a8e1f82f1027d64df960b8228192db72623 # Parent a56051d3cdf5eb423052a52b10718117ee3697c1 8066119: Invalid resource tag used for looking up error message in NativeDataView Reviewed-by: hannesw, sundar diff -r a56051d3cdf5 -r 32fa6a8e1f82 src/jdk/nashorn/internal/objects/NativeDataView.java --- a/src/jdk/nashorn/internal/objects/NativeDataView.java Thu Nov 27 13:04:46 2014 +0100 +++ b/src/jdk/nashorn/internal/objects/NativeDataView.java Fri Nov 28 11:02:54 2014 +0100 @@ -105,10 +105,10 @@ private NativeDataView(final NativeArrayBuffer arrBuf, final ByteBuffer buf, final int offset, final int length) { super(Global.instance().getDataViewPrototype(), $nasgenmap$); - this.buffer = arrBuf; + this.buffer = arrBuf; this.byteOffset = offset; this.byteLength = length; - this.buf = buf; + this.buf = buf; } /** @@ -135,14 +135,14 @@ throw typeError("not.an.arraybuffer.in.dataview"); } - final NativeArrayBuffer arrBuf = (NativeArrayBuffer) args[0]; + final NativeArrayBuffer arrBuf = (NativeArrayBuffer)args[0]; switch (args.length) { - case 1: - return new NativeDataView(arrBuf); - case 2: - return new NativeDataView(arrBuf, JSType.toInt32(args[1])); - default: - return new NativeDataView(arrBuf, JSType.toInt32(args[1]), JSType.toInt32(args[2])); + case 1: + return new NativeDataView(arrBuf); + case 2: + return new NativeDataView(arrBuf, JSType.toInt32(args[1])); + default: + return new NativeDataView(arrBuf, JSType.toInt32(args[1]), JSType.toInt32(args[2])); } } @@ -995,7 +995,7 @@ private static NativeDataView checkSelf(final Object self) { if (!(self instanceof NativeDataView)) { - throw typeError("not.an.arraybuffer", ScriptRuntime.safeToString(self)); + throw typeError("not.an.arraybuffer.in.dataview", ScriptRuntime.safeToString(self)); } return (NativeDataView)self; } diff -r a56051d3cdf5 -r 32fa6a8e1f82 src/jdk/nashorn/internal/runtime/resources/Messages.properties --- a/src/jdk/nashorn/internal/runtime/resources/Messages.properties Thu Nov 27 13:04:46 2014 +0100 +++ b/src/jdk/nashorn/internal/runtime/resources/Messages.properties Fri Nov 28 11:02:54 2014 +0100 @@ -82,7 +82,7 @@ type.error.not.a.file={0} is not a File type.error.not.a.numeric.array={0} is not a numeric array type.error.not.a.bytebuffer={0} is not a java.nio.ByteBuffer -type.error.not.an.arraybuffer.in.dataview=First arg to DataView constructor must be an ArrayBuffer +type.error.not.an.arraybuffer.in.dataview=First argument to DataView constructor must be an ArrayBuffer type.error.no.reflection.with.classfilter=Java reflection not supported when class filter is present # operations not permitted on undefined