Skip to content

Commit 1356b1c

Browse files
authored
Merge pull request #708 from jooby-project/696
rocker: template inheritance doesn't work with maven projects fix #696
2 parents 6fb431e + 26cea2e commit 1356b1c

2 files changed

Lines changed: 12 additions & 0 deletions

File tree

jooby-rocker/src/main/java/org/jooby/rocker/RequestRockerTemplate.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ public RequestRockerTemplate(final RockerModel model) {
3636

3737
@Override
3838
protected void __associate(final RockerTemplate context) {
39+
super.__associate(context);
3940
this.locals = requireTemplateClass(context, RequestRockerTemplate.class).locals;
4041
}
4142

jooby-rocker/src/test/java/org/jooby/rocker/RequestRockerTemplateTest.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import com.fizzed.rocker.RenderingException;
1212
import com.fizzed.rocker.RockerModel;
1313
import com.fizzed.rocker.RockerTemplate;
14+
import com.fizzed.rocker.runtime.DefaultRockerTemplate;
1415
import com.google.common.collect.ImmutableMap;
1516

1617
public class RequestRockerTemplateTest {
@@ -28,6 +29,16 @@ public void setLocals() throws Exception {
2829
});
2930
}
3031

32+
@Test(expected = NullPointerException.class)
33+
public void shouldCallSuperAssociate() throws Exception {
34+
new MockUnit(DefaultRockerTemplate.class, RockerModel.class)
35+
.run(unit -> {
36+
DefaultRockerTemplate ctx = unit.get(DefaultRockerTemplate.class);
37+
RequestRockerTemplate template = template(unit.get(RockerModel.class));
38+
template.__associate(ctx);
39+
});
40+
}
41+
3142
private RequestRockerTemplate template(final RockerModel model) {
3243
return new RequestRockerTemplate(model) {
3344
@Override

0 commit comments

Comments
 (0)