antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 9 Projects Releases 5 Activity Actions

* Check for null format argument in Date.format()

Browse source
This commit is contained in:
hns 2005-11-22 16:57:12 +00:00
parent b64c845258
commit f84ab79675
1 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/helma/scripting/rhino/RhinoCore.java
View file

@ -1059,7 +1059,7 @@ public final class RhinoCore implements ScopeProvider {
Date date = new Date((long) ScriptRuntime.toNumber(thisObj)); Date date = new Date((long) ScriptRuntime.toNumber(thisObj));
SimpleDateFormat df = null; SimpleDateFormat df = null;
if (args.length > 0 && args[0] != Undefined.instance) { if (args.length > 0 && args[0] != Undefined.instance && args[0] != null) {
if (args.length > 1 && args[1] instanceof NativeJavaObject) { if (args.length > 1 && args[1] instanceof NativeJavaObject) {
Object locale = ((NativeJavaObject) args[1]).unwrap(); Object locale = ((NativeJavaObject) args[1]).unwrap();
if (locale instanceof Locale) { if (locale instanceof Locale) {
@ -1125,4 +1125,3 @@ public final class RhinoCore implements ScopeProvider {
} }
} }