8301457: Code in SendPortZero.java is uncommented even after JDK-8236852 was fixed #14952

Michael-Mc-Mahon · 2023-07-20T10:50:17Z

Hi,

JDK-8236852 was fixed in 15 and included its own regression test, but a couple of existing tests have code commented out that also test this functionality. One scenario relating to sending to the wildcard address was not addressed and remains commented out.

Thanks,
Michael.

Progress

Change must be properly reviewed (1 review required, with at least 1 Reviewer)
Change must not contain extraneous whitespace
Commit message must refer to an issue

Issue

JDK-8301457: Code in SendPortZero.java is uncommented even after JDK-8236852 was fixed (Bug - P4)

Reviewers

Aleksei Efimov (@AlekseiEfimov - Reviewer)
Mark Sheppard (@msheppar - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/14952/head:pull/14952
$ git checkout pull/14952

Update a local copy of the PR:
$ git checkout pull/14952
$ git pull https://git.openjdk.org/jdk.git pull/14952/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 14952

View PR using the GUI difftool:
$ git pr show -t 14952

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/14952.diff

Webrev

Link to Webrev Comment

bridgekeeper · 2023-07-20T10:51:57Z

👋 Welcome back michaelm! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

openjdk · 2023-07-20T10:53:38Z

@Michael-Mc-Mahon The following label will be automatically applied to this pull request:

net

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.

mlbridge · 2023-07-20T13:07:53Z

Webrevs

01: Full - Incremental (0fd4bba7)
00: Full (0b10e5f3)

AlekseiEfimov

The changes look fine to me.
You might want to change the last modification years in both copyright headers.

AlekseiEfimov · 2023-07-21T16:31:19Z

test/jdk/java/net/DatagramSocket/SendPortZero.java

        // wildcard addr w/valid port
+        // Referenced in bug 8236105, but not addressed.
+        // So, this scenario is not tested


Is this scenario planned to be addressed? If there is a bug for that (JDK-8236807?) then it could be mentioned in this comment.

That bug looks like the same issue. I will add a comment to the code and a note in the bug report about the test.

msheppar · 2023-07-21T16:38:20Z

test/jdk/java/net/DatagramSocket/SendPortZero.java

-        wildcardValidPkt.setAddress(addr);
-        wildcardValidPkt.setPort(socket.getLocalPort());
-      */
+        wildcardValidPkt.setAddress(wildcardAddr);


you have enabled setup code, but not enabled its coresponding test scenario. Is that intentional?

openjdk · 2023-07-21T16:39:07Z

@Michael-Mc-Mahon 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:

8301457: Code in SendPortZero.java is uncommented even after JDK-8236852 was fixed

Reviewed-by: aefimov, msheppar

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 84 new commits pushed to the master branch:

197981b: 8311881: jdk/javax/swing/ProgressMonitor/ProgressTest.java does not show the ProgressMonitorInputStream all the time
04f39e1: 8310316: Failing HotSpot Compiler directives are too verbose
f3ade38: 8308593: Add Keepalive Extended Socket Options Support for Windows
ab821aa: 6442919: JFilechooser popup still left-to-right when JFilechooser is set to right-to-left
0328886: 8311955: c++filt is now ibm-llvm-cxxfilt when using xlc17 / clang on AIX
0487aa6: 8312530: Problemlist runtime/os/TestTrimNative.java
8d1ab57: 8301341: LinkedTransferQueue does not respect timeout for poll()
bfa76df: 8311978: Shenandoah: Create abstraction over heap metrics for heuristics
3c644dc: 8312044: Simplify toolkit Builder/Writer world
f4ba7b2: 8312414: Make java.util.ServiceLoader.LANG_ACCESS final
... and 74 more: https://git.openjdk.org/jdk/compare/3fb9d117e353af6f007e701a8cd635763bd3cc28...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

msheppar · 2023-07-21T16:39:15Z

test/jdk/java/net/MulticastSocket/SendPortZero.java

-        wildcardValidPkt.setAddress(addr);
-        wildcardValidPkt.setPort(socket.getLocalPort());
-      */
+        wildcardValidPkt.setAddress(wildcardAddr);


again enabling setup but not enabling a corrsponding test scenario?

Yes, I thought it cleaner to just disable the test in one place.

Michael-Mc-Mahon · 2023-07-24T14:12:04Z

/integrate

openjdk · 2023-07-24T14:13:47Z

Going to push as commit 298dda4.
Since your change was applied there have been 85 commits pushed to the master branch:

7dd4799: 8311847: Fix -Wconversion for assembler.hpp emit_int8,16 callers
197981b: 8311881: jdk/javax/swing/ProgressMonitor/ProgressTest.java does not show the ProgressMonitorInputStream all the time
04f39e1: 8310316: Failing HotSpot Compiler directives are too verbose
f3ade38: 8308593: Add Keepalive Extended Socket Options Support for Windows
ab821aa: 6442919: JFilechooser popup still left-to-right when JFilechooser is set to right-to-left
0328886: 8311955: c++filt is now ibm-llvm-cxxfilt when using xlc17 / clang on AIX
0487aa6: 8312530: Problemlist runtime/os/TestTrimNative.java
8d1ab57: 8301341: LinkedTransferQueue does not respect timeout for poll()
bfa76df: 8311978: Shenandoah: Create abstraction over heap metrics for heuristics
3c644dc: 8312044: Simplify toolkit Builder/Writer world
... and 75 more: https://git.openjdk.org/jdk/compare/3fb9d117e353af6f007e701a8cd635763bd3cc28...master

Your commit was automatically rebased without conflicts.

openjdk · 2023-07-24T14:13:55Z

@Michael-Mc-Mahon Pushed as commit 298dda4.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

test cases update

0b10e5f

openjdk bot added the net net-dev@openjdk.org label Jul 20, 2023

Michael-Mc-Mahon changed the title ~~Code in SendPortZero.java is uncommented even after JDK-8236852 was fixed~~ 8301457: Code in SendPortZero.java is uncommented even after JDK-8236852 was fixed Jul 20, 2023

openjdk bot added the rfr Pull request is ready for review label Jul 20, 2023

AlekseiEfimov approved these changes Jul 21, 2023

View reviewed changes

msheppar reviewed Jul 21, 2023

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Jul 21, 2023

msheppar reviewed Jul 21, 2023

View reviewed changes

Michael-Mc-Mahon added 2 commits July 24, 2023 08:58

test update

73a1a27

copyright headers

0fd4bba

msheppar approved these changes Jul 24, 2023

View reviewed changes

AlekseiEfimov approved these changes Jul 24, 2023

View reviewed changes

openjdk bot added the integrated Pull request has been integrated label Jul 24, 2023

openjdk bot closed this Jul 24, 2023

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jul 24, 2023

Michael-Mc-Mahon deleted the sendportzero branch July 24, 2023 15:21

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8301457: Code in SendPortZero.java is uncommented even after JDK-8236852 was fixed #14952

8301457: Code in SendPortZero.java is uncommented even after JDK-8236852 was fixed #14952

Michael-Mc-Mahon commented Jul 20, 2023 •

edited by openjdk bot

Loading

bridgekeeper bot commented Jul 20, 2023

openjdk bot commented Jul 20, 2023

mlbridge bot commented Jul 20, 2023 •

edited

Loading

AlekseiEfimov left a comment

AlekseiEfimov Jul 21, 2023

Michael-Mc-Mahon Jul 24, 2023

msheppar Jul 21, 2023

openjdk bot commented Jul 21, 2023 •

edited

Loading

msheppar Jul 21, 2023

Michael-Mc-Mahon Jul 24, 2023

Michael-Mc-Mahon commented Jul 24, 2023

openjdk bot commented Jul 24, 2023

openjdk bot commented Jul 24, 2023

8301457: Code in SendPortZero.java is uncommented even after JDK-8236852 was fixed #14952

8301457: Code in SendPortZero.java is uncommented even after JDK-8236852 was fixed #14952

Conversation

Michael-Mc-Mahon commented Jul 20, 2023 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

Webrev

bridgekeeper bot commented Jul 20, 2023

openjdk bot commented Jul 20, 2023

mlbridge bot commented Jul 20, 2023 • edited Loading

Webrevs

AlekseiEfimov left a comment

Choose a reason for hiding this comment

AlekseiEfimov Jul 21, 2023

Choose a reason for hiding this comment

Michael-Mc-Mahon Jul 24, 2023

Choose a reason for hiding this comment

msheppar Jul 21, 2023

Choose a reason for hiding this comment

openjdk bot commented Jul 21, 2023 • edited Loading

msheppar Jul 21, 2023

Choose a reason for hiding this comment

Michael-Mc-Mahon Jul 24, 2023

Choose a reason for hiding this comment

Michael-Mc-Mahon commented Jul 24, 2023

openjdk bot commented Jul 24, 2023

openjdk bot commented Jul 24, 2023

Michael-Mc-Mahon commented Jul 20, 2023 •

edited by openjdk bot

Loading

mlbridge bot commented Jul 20, 2023 •

edited

Loading

openjdk bot commented Jul 21, 2023 •

edited

Loading