Skip to content

Commit dbf374f

Browse files
authored
Merge pull request #519 from avaje/feautre/jex-gen-resultNullCheck
[Jex generation] Add check for non null result in generated code
2 parents e5367d3 + 83e98e5 commit dbf374f

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

http-generator-jex/src/main/java/io/avaje/http/generator/jex/ControllerMethodWriter.java

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,8 @@ private void write(boolean requestScoped) {
103103
}
104104
writer.append(" ");
105105
if (!method.isVoid()) {
106-
writeContextReturn();
106+
writer.append("var result = ");
107+
107108
}
108109
if (instrumentContext) {
109110
method.writeContext(writer, "ctx", "ctx");
@@ -128,13 +129,17 @@ private void write(boolean requestScoped) {
128129
}
129130
}
130131
writer.append(")");
131-
if (!method.isVoid()) {
132-
writer.append(")");
133-
}
134132
if (instrumentContext) {
135133
writer.append(")");
136134
}
137135
writer.append(";").eol();
136+
if (!method.isVoid()) {
137+
writer.append(" if (result != null) {").eol();
138+
writer.append(" ");
139+
writeContextReturn();
140+
writer.append("result);").eol();
141+
writer.append(" }").eol();
142+
}
138143
}
139144

140145
private void writeContextReturn() {

0 commit comments

Comments
 (0)