|
@@ -13,6 +13,7 @@ import java.util.Map;
|
|
|
import java.util.regex.Matcher;
|
|
import java.util.regex.Matcher;
|
|
|
import java.util.regex.Pattern;
|
|
import java.util.regex.Pattern;
|
|
|
import net.ranides.assira.collection.ArrayUtils;
|
|
import net.ranides.assira.collection.ArrayUtils;
|
|
|
|
|
+import net.ranides.assira.generic.ValueUtils;
|
|
|
import net.ranides.assira.text.Strings;
|
|
import net.ranides.assira.text.Strings;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -181,7 +182,7 @@ public final class Resolver implements Serializable {
|
|
|
@Override
|
|
@Override
|
|
|
public Object get(Object context) {
|
|
public Object get(Object context) {
|
|
|
if(context instanceof Matcher) {
|
|
if(context instanceof Matcher) {
|
|
|
- return ((Matcher)context).group(index);
|
|
|
|
|
|
|
+ return ValueUtils.or(((Matcher)context).group(index), "");
|
|
|
}
|
|
}
|
|
|
if(context instanceof CharSequence) {
|
|
if(context instanceof CharSequence) {
|
|
|
return ((CharSequence)context).charAt(index);
|
|
return ((CharSequence)context).charAt(index);
|