Dave Jarvis' Repositories

git clone https://repo.autonoma.ca/repo/keenwrite.git

Avoid infinite recursion for missing keys

AuthorDaveJarvis <email>
Date2020-07-08 22:45:29 GMT-0700
Commit4e68495f98b568c440560d487434a842ea4cf77f
Parent2ab77df
Delta4 lines added, 3 lines removed, 1-line increase
src/main/java/com/scrivenvar/definition/MapInterpolator.java
while( matcher.find() ) {
final String keyName = matcher.group( GROUP_DELIMITED );
- final String keyValue = resolve(
- map, map.getOrDefault( keyName, keyName )
- );
+ final String mapValue = map.get( keyName );
+ final String keyValue = mapValue == null
+ ? keyName
+ : resolve( map, mapValue );
value = value.replace( keyName, keyValue );