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

Allowing Blocking call for handlePossibleCancellationInterrupt #3515

Merged
merged 8 commits into from
Jun 30, 2023
Merged

Allowing Blocking call for handlePossibleCancellationInterrupt #3515

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0157aa0
Allowing Blocking call for handlePossibleCancellationInterrupt
tejavenkatlanka Jun 22, 2023
c7cdc0a
updating licence
tejavenkatlanka Jun 22, 2023
1f39369
updating timeout to 10 sec
tejavenkatlanka Jun 23, 2023
729b6d7
Revert "updating timeout to 10 sec"
tejavenkatlanka Jun 27, 2023
8ddb8ee
Revert "Allowing Blocking call for handlePossibleCancellationInterrupt"
tejavenkatlanka Jun 27, 2023
d98256b
Allowing Blocking call for handlePossibleCancellationInterrupt
tejavenkatlanka Jun 27, 2023
6034d88
Revert "updating licence"
tejavenkatlanka Jun 30, 2023
be37565
using class object reference
tejavenkatlanka Jun 30, 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 ...core/src/blockHoundTest/java/reactor/core/scheduler/ReactorBlockHoundIntegrationTest.java
View file
Open in desktop
tejavenkatlanka marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019-2022 VMware Inc. or its affiliates, All Rights Reserved.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should also be reverted

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @OlegDokuka reverted this change

* Copyright (c) 2019-2023 VMware Inc. or its affiliates, All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
4 changes: 3 additions & 1 deletion reactor-core/src/main/java/reactor/core/scheduler/ReactorBlockHoundIntegration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019-2022 VMware Inc. or its affiliates, All Rights Reserved.
* Copyright (c) 2019-2023 VMware Inc. or its affiliates, All Rights Reserved.
*
* 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 @@ -50,5 +50,7 @@ public void applyTo(BlockHound.Builder builder) {
// For now, let's not add a separate integration, but rather let's define the class name manually
// ContextRegistry reads files as part of the Service Loader aspect. If class is initialized in a non-blocking thread, BlockHound would complain
builder.allowBlockingCallsInside("reactor.core.publisher.ContextPropagation", "<clinit>");
builder.allowBlockingCallsInside("java.util.concurrent.FutureTask",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use FutureTask.class.getName() instead of "java.util.concurrent.FutureTask"

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update with class reference

"handlePossibleCancellationInterrupt");
}
}
Loading