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.
This commit is contained in:
parent
33c7eda08c
commit
3adf646e35
1 changed files with 2 additions and 1 deletions
|
@ -264,7 +264,7 @@ public abstract class ESLoader extends ESObject {
|
||||||
// return evaluator.reval.getElementWrapper ((helma.framework.IPathElement) obj);
|
// return evaluator.reval.getElementWrapper ((helma.framework.IPathElement) obj);
|
||||||
// }
|
// }
|
||||||
// return new ESWrapper(obj, evaluator);
|
// 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)
|
if (targetClass.isPrimitive()) { // or: Object.class.isAssignableFrom(targetClass)
|
||||||
accepted = false;
|
accepted = false;
|
||||||
debugInfo = " rejected (null cannot be assigned to primitive)";
|
debugInfo = " rejected (null cannot be assigned to primitive)";
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
accepted = true;
|
accepted = true;
|
||||||
debugInfo = " accepted (null to Object)";
|
debugInfo = " accepted (null to Object)";
|
||||||
|
|
Loading…
Add table
Reference in a new issue