Skip to content

Commit 565dd54

Browse files
temporary fix to AppEngineAnnotationConfiguration for issue #462
Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>
1 parent 4574b98 commit 565dd54

2 files changed

Lines changed: 5 additions & 0 deletions

File tree

runtime/local_jetty121/src/main/java/com/google/appengine/tools/development/jetty/AppEngineAnnotationConfiguration.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ public class AppEngineAnnotationConfiguration extends AnnotationConfiguration {
3131
@Override
3232
public List<ServletContainerInitializer> getNonExcludedInitializers(WebAppContext context)
3333
throws Exception {
34+
// TODO: remove this line when https://github.com/jetty/jetty.project/issues/14431 is resolved.
35+
context.getMetaData().orderFragments();
36+
3437
ArrayList<ServletContainerInitializer> nonExcludedInitializers =
3538
new ArrayList<>(super.getNonExcludedInitializers(context));
3639
for (ServletContainerInitializer sci : nonExcludedInitializers) {

runtime/local_jetty121_ee11/src/main/java/com/google/appengine/tools/development/jetty/ee11/AppEngineAnnotationConfiguration.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
public class AppEngineAnnotationConfiguration extends AnnotationConfiguration {
3030
@Override
3131
protected List<ServletContainerInitializer> getNonExcludedInitializers(State state) {
32+
// TODO: remove this line when https://github.com/jetty/jetty.project/issues/14431 is resolved.
33+
state._context.getMetaData().orderFragments();
3234

3335
List<ServletContainerInitializer> initializers = super.getNonExcludedInitializers(state);
3436
for (ServletContainerInitializer sci : initializers) {

0 commit comments

Comments
 (0)