From eee11438d74b453aa1bf069115e25065f2587e3f Mon Sep 17 00:00:00 2001 From: hns Date: Fri, 2 Apr 2004 12:17:33 +0000 Subject: [PATCH] Removed/unified semi-redundant else-if branch --- src/helma/scripting/rhino/RhinoEngine.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/helma/scripting/rhino/RhinoEngine.java b/src/helma/scripting/rhino/RhinoEngine.java index 1e5e9163..be58be89 100644 --- a/src/helma/scripting/rhino/RhinoEngine.java +++ b/src/helma/scripting/rhino/RhinoEngine.java @@ -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