litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-2470 Restore parameter type checking on DumpDirective and HelpDirective. Handle undefined variables by assigning value = "Undefined."

Browse source
This commit is contained in:
ryounes 2011-04-20 21:37:12 +00:00
parent 84f779238c
commit d64d45d8e6
4 changed files with 21 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
webapp/src/freemarker/ext/dump/BaseDumpDirective.java
View file

@ -83,8 +83,7 @@ public abstract class BaseDumpDirective implements TemplateDirectiveModel {
METHOD("Method"),
NUMBER("Number"),
SEQUENCE("Sequence"),
STRING("String"),
UNDEFINED("Undefined");
STRING("String");
private final String type;
@ -128,7 +127,6 @@ public abstract class BaseDumpDirective implements TemplateDirectiveModel {
Map<String, Object> value = new HashMap<String, Object>();
if (model == null) {
value.put(Key.TYPE.toString(), Type.UNDEFINED);
value.put(Key.VALUE.toString(), VALUE_UNDEFINED);
// TemplateMethodModel and TemplateDirectiveModel objects can only be