Initialize cause of some InterruptedExceptions #1301
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Test Results 899 files - 1 899 suites - 1 35m 20s ⏱️ - 29m 57s For more details on these failures and errors, see this check. Results for commit eae8d35. ± Comparison against base commit 2670545. ♻️ This comment has been updated with latest results. |
|
The check failures don't seem to be related to my changes since I haven't changed any API. |
|
it's tycho problem, see eclipse-tycho/tycho#3019 |
HeikoKlare
reviewed
Nov 13, 2023
There was a problem hiding this comment.
I agree that the existing exception handling in WorkspaceModifyOperation is not correct, but the fix does seem to solve the problem completey (see my detailed comment).
I do not understand the reason for all the other changes, like I have argued for the according changes to the platform repository here.
bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/actions/WorkspaceModifyOperation.java
Outdated
Show resolved
Hide resolved
fedejeanne
force-pushed
the
enhancements/init_InterruptedException_upon_user_cancelation
branch
from
6ec5b2c
to
b6c33cd
Compare
HeikoKlare
reviewed
Nov 13, 2023
bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/actions/WorkspaceModifyOperation.java
Outdated
Show resolved
Hide resolved
HeikoKlare
reviewed
Nov 13, 2023
bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/actions/WorkspaceModifyOperation.java
Outdated
Show resolved
Hide resolved
HeikoKlare
reviewed
Nov 13, 2023
bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/actions/WorkspaceModifyOperation.java
Show resolved
Hide resolved
HeikoKlare
reviewed
Nov 13, 2023
bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/actions/WorkspaceModifyOperation.java
Outdated
Show resolved
Hide resolved
fedejeanne
force-pushed
the
enhancements/init_InterruptedException_upon_user_cancelation
branch
2 times, most recently
from
12615e9
to
5b150d4
Compare
HeikoKlare
reviewed
Nov 15, 2023
bundles/org.eclipse.jface/src/org/eclipse/jface/operation/ModalContext.java
Outdated
Show resolved
Hide resolved
bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/deferred/LazySortedCollection.java
Outdated
Show resolved
Hide resolved
...lipse.ui.ide/src/org/eclipse/ui/internal/wizards/datatransfer/FileSystemExportOperation.java
Outdated
Show resolved
Hide resolved
...de/src/org/eclipse/ui/internal/wizards/datatransfer/WizardFileSystemResourceImportPage1.java
Outdated
Show resolved
Hide resolved
fedejeanne
force-pushed
the
enhancements/init_InterruptedException_upon_user_cancelation
branch
from
5b150d4
to
1b57e20
Compare
|
I reverted some changes, I hope it's looking good now @HeikoKlare ? |
HeikoKlare
approved these changes
Nov 17, 2023
HeikoKlare
force-pushed
the
enhancements/init_InterruptedException_upon_user_cancelation
branch
from
1b57e20
to
0f77e30
Compare
Pack an OperationCanceledException inside the InterruptedException when this is thrown due to the user canceling an operation. This makes it easier to determine the cause of the InterruptedException from outside the methods (i.e. in the catch-clauses). Adapt the method ModalContext::checkCanceled accordingly. Change WorkspaceModifyOperation::run so it preserves the original exceptions if possible. Same idea as eclipse-platform#1259
HeikoKlare
force-pushed
the
enhancements/init_InterruptedException_upon_user_cancelation
branch
from
0f77e30
to
eae8d35
Compare
This was referenced Nov 29, 2023
fedejeanne
deleted the
enhancements/init_InterruptedException_upon_user_cancelation
branch
19 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pack an
OperationCanceledExceptioninside theInterruptedExceptionwhen this is thrown due to the user canceling an operation. This makes it easier to determine the cause of theInterruptedExceptionfrom outside the methods (i.e. in the catch-clauses). Adapt the methodModalContext::checkCanceledaccordingly. LetWorkspaceModifyOperation::runuse the originalOperationCanceledExceptionif provided and only create a new one as a fallback.Same idea as #1259