Skip to content

Commit f1d25ac

Browse files
committed
Merge branch '1.8' into test-engine
2 parents 08a8b5c + 9c99aed commit f1d25ac

1 file changed

Lines changed: 10 additions & 8 deletions

File tree

‎src/main/java/act/route/Router.java‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -538,14 +538,16 @@ public String reverseRoute(String action, H.Method method, Map<String, Object> a
538538
break;
539539
}
540540
}
541-
S.Buffer buffer = S.buffer();
542-
for ($.Transformer<Map<String, Object>, String> builder : targetNode.nodeValueBuilders) {
543-
String s = builder.transform(args);
544-
buffer.append(s);
545-
}
546-
String s = buffer.toString();
547-
if (S.blank(s)) {
548-
s = S.string(args.remove(S.string(targetNode.varNames.get(varId++))));
541+
String s = "";
542+
if (!args.isEmpty()) {
543+
S.Buffer buffer = S.buffer();
544+
for ($.Transformer<Map<String, Object>, String> builder : targetNode.nodeValueBuilders) {
545+
buffer.append(builder.transform(args));
546+
}
547+
s = buffer.toString();
548+
if (S.blank(s) && targetNode.varNames.size() <= varId) {
549+
s = S.string(args.remove(S.string(targetNode.varNames.get(varId++))));
550+
}
549551
}
550552
if (S.blank(s)) {
551553
s = S.string("-");

0 commit comments

Comments
 (0)