MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-21 22:11:40 +07:00
Code Issues Packages Projects Releases Wiki Activity

IJPL-162087 Call resetThreadContext inside the methods of ContextAwareBuilderMessageHandler

Browse Source 
GitOrigin-RevId: 866a1927cd423b59acb074a6bf8752cf1a7f8d53
This commit is contained in:
Artem.Bukhonov
2024-09-11 16:21:19 +02:00
committed by intellij-monorepo-bot
parent 504e647791
commit 5313707077
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
java/compiler/impl/src/com/intellij/compiler/server/BuildMessageDispatcher.java
View File

@@ -104,10 +104,7 @@ class BuildMessageDispatcher extends SimpleChannelInboundHandlerAdapter<CmdlineR
sessionData.state = SessionData.State.RUNNING;
final Channel channel = sessionData.channel;
if (channel != null && channel.isActive()) {
// context is already captured inside ContextAwareBuilderMessageHandler
try (AccessToken ignored = ThreadContext.resetThreadContext()) {
sessionData.handler.buildStarted(preloadedSessionId);
}
sessionData.handler.buildStarted(preloadedSessionId);
channel.writeAndFlush(CmdlineProtoUtil.toMessage(preloadedSessionId, params));
succeeded = true;
}
@@ -255,22 +252,30 @@ class BuildMessageDispatcher extends SimpleChannelInboundHandlerAdapter<CmdlineR
@Override
public void buildStarted(@NotNull UUID sessionId) {
myCapturedContext.runInChildContext(() -> myDelegate.buildStarted(sessionId));
try (AccessToken ignored = ThreadContext.resetThreadContext()) {
myCapturedContext.runInChildContext(() -> myDelegate.buildStarted(sessionId));
}
}
@Override
public void handleBuildMessage(Channel channel, UUID sessionId, CmdlineRemoteProto.Message.BuilderMessage msg) {
myCapturedContext.runInChildContext(() -> myDelegate.handleBuildMessage(channel, sessionId, msg));
try (AccessToken ignored = ThreadContext.resetThreadContext()) {
myCapturedContext.runInChildContext(() -> myDelegate.handleBuildMessage(channel, sessionId, msg));
}
}
@Override
public void handleFailure(@NotNull UUID sessionId, CmdlineRemoteProto.Message.Failure failure) {
myCapturedContext.runInChildContext(() -> myDelegate.handleFailure(sessionId, failure));
try (AccessToken ignored = ThreadContext.resetThreadContext()) {
myCapturedContext.runInChildContext(() -> myDelegate.handleFailure(sessionId, failure));
}
}
@Override
public void sessionTerminated(@NotNull UUID sessionId) {
myCapturedContext.runInChildContext(() -> myDelegate.sessionTerminated(sessionId));
try (AccessToken ignored = ThreadContext.resetThreadContext()) {
myCapturedContext.runInChildContext(() -> myDelegate.sessionTerminated(sessionId));
}
}
}
}