-
Notifications
You must be signed in to change notification settings - Fork 5.8k
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.
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
8285690: CloneableReference subtest should not throw CloneNotSupportedException #8418
Conversation
👋 Welcome back kbarrett! A progress list of the required criteria for merging this PR into |
@kimbarrett The following label will be automatically applied to this pull request:
When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command. |
Webrevs
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
@kimbarrett This change now passes all automated pre-integration checks. ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details. After integration, the commit message for the final commit will be:
You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed. At the time when this comment was updated there had been 3 new commits pushed to the
Please see this link for an up-to-date comparison between the source branch of this pull request and the ➡️ To integrate this PR with the above commit message to the |
} catch (CloneNotSupportedException e) {} | ||
} catch (CloneNotSupportedException e) { | ||
throw new RuntimeException("CloneableReference::clone should not throw CloneNotSupportedException"); | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Alternatively, it could simply let CNSE propagate.
CloneableReference ref = new CloneableReference(o);
ref.clone();
test()
and main
will need to declare this checked exception.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That was my initial thought, but it doesn't work - CNSE is a checked exception so must be handled.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
test() and main will need to declare this checked exception.
diff --git a/test/jdk/java/lang/ref/ReferenceClone.java b/test/jdk/java/lang/ref/ReferenceClone.java
index bd1ead81bec..2f9386b81e4 100644
--- a/test/jdk/java/lang/ref/ReferenceClone.java
+++ b/test/jdk/java/lang/ref/ReferenceClone.java
@@ -31,12 +31,12 @@ import java.lang.ref.*;
public class ReferenceClone {
private static final ReferenceQueue<Object> QUEUE = new ReferenceQueue<>();
- public static void main(String... args) {
+ public static void main(String... args) throws Exception {
ReferenceClone refClone = new ReferenceClone();
refClone.test();
}
- public void test() {
+ public void test() throws CloneNotSupportedException {
// test Reference::clone that throws CNSE
Object o = new Object();
assertCloneNotSupported(new SoftRef(o));
@@ -45,9 +45,7 @@ public class ReferenceClone {
// Reference subclass may override the clone method
CloneableReference ref = new CloneableReference(o);
- try {
ref.clone();
- } catch (CloneNotSupportedException e) {}
}
private void assertCloneNotSupported(CloneableRef ref) {
```
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, that would work. But I'd rather keep the code for that subtest close together, i.e. as currently written.
Thanks for reviews @RogerRiggs and @mlchung |
/integrate |
Going to push as commit 2d8d140.
Your commit was automatically rebased without conflicts. |
@kimbarrett Pushed as commit 2d8d140. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
Please review this fix to test/jdk/java/lang/ref/ReferenceClone.java. It was
passing if CloneableReference::clone were to throw CloneNotSupportedException.
That should be a failure.
Testing:
Locally (linux-x64) verified test still passes. Temporarily changed
CloneableReference::clone to throw and verified the expected failure gets
reported, unlike before.
Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/8418/head:pull/8418
$ git checkout pull/8418
Update a local copy of the PR:
$ git checkout pull/8418
$ git pull https://git.openjdk.java.net/jdk pull/8418/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 8418
View PR using the GUI difftool:
$ git pr show -t 8418
Using diff file
Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/8418.diff