From 67f38dceb84dcba919b59259ee83ceafaea64cb0 Mon Sep 17 00:00:00 2001
From: hns <hannesw@gmail.com>
Date: Tue, 10 Jun 2003 15:41:57 +0000
Subject: [PATCH] Unwrap native java objects gotten as properties.

---
 src/helma/scripting/rhino/RhinoEngine.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/helma/scripting/rhino/RhinoEngine.java b/src/helma/scripting/rhino/RhinoEngine.java
index 85edc869..1d4ecb1f 100644
--- a/src/helma/scripting/rhino/RhinoEngine.java
+++ b/src/helma/scripting/rhino/RhinoEngine.java
@@ -394,15 +394,17 @@ public final class RhinoEngine implements ScriptingEngine {
         try {
             Object prop = so.get(propname, so);
 
-            if (prop != Undefined.instance) {
+            if ((prop == null) || (prop == Undefined.instance)) {
+                return null;
+            } else if (prop instanceof NativeJavaObject) {
+                return ((NativeJavaObject) prop).unwrap();
+            } else {
                 return prop;
             }
         } catch (Exception esx) {
             // System.err.println ("Error in getProperty: "+esx);
             return null;
         }
-
-        return null;
     }
 
     /**