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

Removed/unified semi-redundant else-if branch

Browse source
This commit is contained in:
hns 2004-04-02 12:17:33 +00:00
parent 750f209035
commit eee11438d7
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/helma/scripting/rhino/RhinoEngine.java
View file

@ -396,12 +396,11 @@ public class RhinoEngine implements ScriptingEngine {
try {
Object prop = so.get(propname, so);
if ((prop == null) || (prop == Undefined.instance)) {
if ((prop == null) || (prop == Undefined.instance)
|| (prop == ScriptableObject.NOT_FOUND)) {
return null;
} else if (prop instanceof Wrapper) {
return ((Wrapper) prop).unwrap();
} else if (prop == Undefined.instance || prop == ScriptableObject.NOT_FOUND) {
return null;
} else {
// not all Rhino types convert to a string as expected
// when calling toString() - try to do better by using