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

Fix racing on route handler's indexes change #2605

Open
wants to merge 1 commit into
base: 4.x
Choose a base branch
from
Open

Fix racing on route handler's indexes change #2605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 12 additions & 8 deletions vertx-web/src/main/java/io/vertx/ext/web/impl/RouteState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1279,16 +1279,20 @@ boolean hasNextFailureHandler(RoutingContextImplBase context) {
return context.currentRouteNextFailureHandlerIndex() < getFailureHandlersLength();
}

void handleContext(RoutingContextImplBase context) {
contextHandlers
.get(context.currentRouteNextHandlerIndex() - 1)
.handle(context);
Handler<RoutingContext> nextContextHandler(RoutingContextImplBase context) {
int index = context.nextContextHandler(getContextHandlersLength());
if (index < 0) {
return null;
}
return contextHandlers.get(index);
}

void handleFailure(RoutingContextImplBase context) {
failureHandlers
.get(context.currentRouteNextFailureHandlerIndex() - 1)
.handle(context);
Handler<RoutingContext> nextFailureHandler(RoutingContextImplBase context) {
int index = context.nextFailureHandler(getFailureHandlersLength());
if (index < 0) {
return null;
}
return failureHandlers.get(index);
}

public String getName() {
Expand Down
44 changes: 32 additions & 12 deletions vertx-web/src/main/java/io/vertx/ext/web/impl/RoutingContextImplBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,18 +130,39 @@ void restart() {
next();
}

final int nextFailureHandler(int limit) {
int index;
do {
index = currentRouteNextFailureHandlerIndex;
if (index >= limit) {
return -1;
}
} while (!CURRENT_ROUTE_NEXT_FAILURE_HANDLER_INDEX.compareAndSet(this, index, index + 1));
return index;
}

final int nextContextHandler(int limit) {
int index;
do {
index = currentRouteNextHandlerIndex;
if (index >= limit) {
return -1;
}
} while (!CURRENT_ROUTE_NEXT_HANDLER_INDEX.compareAndSet(this, index, index + 1));
return index;
}

boolean iterateNext() {
boolean failed = failed();
if (currentRoute != null) { // Handle multiple handlers inside route object
try {
if (!failed && currentRoute.hasNextContextHandler(this)) {
CURRENT_ROUTE_NEXT_HANDLER_INDEX.incrementAndGet(this);
Handler<RoutingContext> handler;
if (!failed && (handler = currentRoute.nextContextHandler(this)) != null) {
resetMatchFailure();
currentRoute.handleContext(this);
handler.handle(this);
return true;
} else if (failed && currentRoute.hasNextFailureHandler(this)) {
CURRENT_ROUTE_NEXT_FAILURE_HANDLER_INDEX.incrementAndGet(this);
currentRoute.handleFailure(this);
} else if (failed && (handler = currentRoute.nextFailureHandler(this)) != null) {
handler.handle(this);
return true;
}
} catch (Throwable t) {
Expand Down Expand Up @@ -169,12 +190,11 @@ boolean iterateNext() {
if (LOG.isTraceEnabled()) {
LOG.trace("Calling the " + (failed ? "failure" : "") + " handler");
}
if (failed && currentRoute.hasNextFailureHandler(this)) {
CURRENT_ROUTE_NEXT_FAILURE_HANDLER_INDEX.incrementAndGet(this);
routeState.handleFailure(this);
} else if (currentRoute.hasNextContextHandler(this)) {
CURRENT_ROUTE_NEXT_HANDLER_INDEX.incrementAndGet(this);
routeState.handleContext(this);
Handler<RoutingContext> handler;
if (failed && (handler = currentRoute.nextFailureHandler(this)) != null) {
handler.handle(this);
} else if ((handler = currentRoute.nextContextHandler(this)) != null) {
handler.handle(this);
} else {
continue;
}
Expand Down
Loading