Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge some missing commits from ee10-jetty branch #78

Merged
merged 2 commits into from
Nov 8, 2023
Merged

merge some missing commits from ee10-jetty branch #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f5a8d0
use proper start/stop lifecycle on scanner
lachlan-roberts Nov 1, 2023
1708b7a
Issue #72 - add fix and TODOs for ParseBlobUploadFilter
lachlan-roberts Nov 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...y12/src/main/java/com/google/appengine/tools/development/jetty/JettyContainerService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ public boolean accept(File dir, String name) {
}
});
scanner.addListener(new ScannerListener());
scanner.doStart();
scanner.start();
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/com/google/appengine/tools/development/jetty/ee10/JettyContainerService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@ public boolean accept(File dir, String name) {
}
});
scanner.addListener(new ScannerListener());
scanner.doStart();
scanner.start();
}

@Override
Expand Down
7 changes: 4 additions & 3 deletions ...y9/src/main/java/com/google/appengine/tools/development/jetty9/JettyContainerService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
import org.eclipse.jetty.server.nio.NetworkTrafficSelectChannelConnector;
import org.eclipse.jetty.servlet.ServletHolder;
import org.eclipse.jetty.util.Scanner;
import org.eclipse.jetty.util.component.LifeCycle;
import org.eclipse.jetty.util.resource.Resource;
import org.eclipse.jetty.webapp.WebAppContext;

Expand Down Expand Up @@ -420,7 +421,7 @@ public boolean accept(File dir, String name) {
}
});
scanner.addListener(new ScannerListener());
scanner.doStart();
scanner.start();
}

@Override
Expand Down Expand Up @@ -463,7 +464,7 @@ private File getScanTarget() throws Exception {
}
}

private void fullWebAppScanner(int interval) throws IOException {
private void fullWebAppScanner(int interval) throws Exception {
String webInf = context.getWebInf().getFile().getPath();
List<File> scanList = new ArrayList<>();
Collections.addAll(
Expand All @@ -488,7 +489,7 @@ public void filesChanged(List<String> changedFiles) throws Exception {
}
});

scanner.doStart();
scanner.start();
}

/**
Expand Down
3 changes: 2 additions & 1 deletion ...etty12/src/main/java/com/google/apphosting/runtime/jetty/ee10/AppEngineWebAppContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,8 @@ public AppEngineWebAppContext(File appDir, String serverInfo, boolean extractWar

setMaxFormContentSize(MAX_RESPONSE_SIZE);

addFilter(new ParseBlobUploadFilter(), "/*", EnumSet.allOf(DispatcherType.class));
// TODO: Can we change to a jetty-core handler? what to do on ASYNC?
addFilter(new ParseBlobUploadFilter(), "/*", EnumSet.of(DispatcherType.REQUEST));
ignoreContentLength = isAppIdForNonContentLength();
}

Expand Down
Loading