From 3adf646e3533e2415029892cdb0977db084faa7e Mon Sep 17 00:00:00 2001 From: hns Date: Sun, 9 Sep 2001 18:09:55 +0000 Subject: [PATCH] call new getObjectWrapper method in RequestEvaluator which may or may not return a scriptable object, depending on whether the object's class name is defined in scriptable.properties. --- src/FESI/Data/ESLoader.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/FESI/Data/ESLoader.java b/src/FESI/Data/ESLoader.java index 750c1d5c..7566809a 100644 --- a/src/FESI/Data/ESLoader.java +++ b/src/FESI/Data/ESLoader.java @@ -264,7 +264,7 @@ public abstract class ESLoader extends ESObject { // return evaluator.reval.getElementWrapper ((helma.framework.IPathElement) obj); // } // return new ESWrapper(obj, evaluator); - return evaluator.reval.getElementWrapper (obj); + return evaluator.reval.getObjectWrapper (obj); } /** @@ -386,6 +386,7 @@ public abstract class ESLoader extends ESObject { if (targetClass.isPrimitive()) { // or: Object.class.isAssignableFrom(targetClass) accepted = false; debugInfo = " rejected (null cannot be assigned to primitive)"; + } else { accepted = true; debugInfo = " accepted (null to Object)";