infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-09 09:58:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

8066119: Invalid resource tag used for looking up error message in NativeDataView

Browse Source 
Reviewed-by: hannesw, sundar
This commit is contained in:
Marcus Lagergren 2014-11-28 11:02:54 +01:00
parent 7b35db48f7
commit 9c7f48c842
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeDataView.java
View File

@ -105,10 +105,10 @@ public class NativeDataView extends ScriptObject {
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 @@ public class NativeDataView extends ScriptObject {
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 @@ public class NativeDataView extends ScriptObject {
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;
}

2
nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/Messages.properties
View File

@ -82,7 +82,7 @@ type.error.not.a.constructor={0} is not a constructor function
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