Skip to content

Commit c34b97d

Browse files
authored
Merge pull request #1130 from HubSpot/dont-limit-when-no-interpreter-exists
When there's no current JinjavaInterpreter, don't limit the maximum number of deferred tokens
2 parents 45d9375 + 51cb2f3 commit c34b97d

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

src/main/java/com/hubspot/jinjava/interpret/Context.java

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -407,15 +407,18 @@ public void checkNumberOfDeferredTokens() {
407407
secondToLastContext = secondToLastContext.parent;
408408
}
409409
}
410-
int maxNumDeferredTokens = JinjavaInterpreter
410+
int currentNumDeferredTokens = secondToLastContext.deferredTokens.size();
411+
JinjavaInterpreter
411412
.getCurrentMaybe()
412413
.map(i -> i.getConfig().getMaxNumDeferredTokens())
413-
.orElse(1000);
414-
if (secondToLastContext.deferredTokens.size() >= maxNumDeferredTokens) {
415-
throw new DeferredValueException(
416-
"Too many Deferred Tokens, max is " + maxNumDeferredTokens
414+
.filter(maxNumDeferredTokens -> currentNumDeferredTokens >= maxNumDeferredTokens)
415+
.ifPresent(
416+
maxNumDeferredTokens -> {
417+
throw new DeferredValueException(
418+
"Too many Deferred Tokens, max is " + maxNumDeferredTokens
419+
);
420+
}
417421
);
418-
}
419422
}
420423

421424
@Beta

0 commit comments

Comments
 (0)