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

Jump to bottom

Error handling removed from the filter chain #6415

Merged
merged 2 commits into from
Mar 23, 2023
Merged

Error handling removed from the filter chain #6415

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4792efb
Error handling removed from filter chain
Verdent Mar 16, 2023
07f5d32
copyright
Verdent Mar 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 7 additions & 7 deletions nima/webserver/webserver/src/main/java/io/helidon/nima/webserver/http/Filters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 Oracle and/or its affiliates.
* Copyright (c) 2022, 2023 Oracle and/or its affiliates.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -80,7 +80,12 @@ public void filter(ConnectionContext ctx, RoutingRequest request, RoutingRespons

FilterChain chain = new FilterChainImpl(ctx, errorHandlers, filters, request, response, routingExecutor);
request.path(new FilterRoutedPath(request.prologue().uriPath()));
errorHandlers.runWithErrorHandling(ctx, request, response, () -> executeFilters(chain));
}

private Void executeFilters(FilterChain chain) {
chain.proceed();
return null;
}

private static final class FilterChainImpl implements FilterChain {
Expand Down Expand Up @@ -111,7 +116,7 @@ public void proceed() {
return;
}
if (filters.hasNext()) {
errorHandlers.runWithErrorHandling(ctx, request, response, this::runNextFilter);
filters.next().filter(this, request, response);
Verdent marked this conversation as resolved.
Show resolved Hide resolved
} else {
errorHandlers.runWithErrorHandling(ctx, request, response, routingExecutor);
if (!response.isSent()) {
Expand All @@ -122,11 +127,6 @@ public void proceed() {
}
}
}

private Void runNextFilter() {
filters.next().filter(this, request, response);
return null;
}
}

private static final class FilterRoutedPath implements RoutedPath {
Expand Down