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.

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

8301367: Add exception handler method to the BaseLdapServer #12347

Conversation

AlekseiEfimov
Copy link
Member

@AlekseiEfimov AlekseiEfimov commented Jan 31, 2023

The proposed change adds a new exception handler method to the test/jdk/com/sun/jndi/ldap/lib/BaseLdapServer.java LDAP test library class. It will allow LDAP tests to customize the handling of server-side exceptions.
The current BaseLdapTestServer implementation prints an exception and its stack trace to the standard error stream.

Existing tests in test/jdk/com/sun/jndi/ldap that use the modified library class are passing with the modified version.


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-8301367: Add exception handler method to the BaseLdapServer

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 12347

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 31, 2023

👋 Welcome back aefimov! 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 openjdk bot added the rfr Pull request is ready for review label Jan 31, 2023
@openjdk
Copy link

openjdk bot commented Jan 31, 2023

@AlekseiEfimov The following label will be automatically applied to this pull request:

  • core-libs

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.

@openjdk openjdk bot added the core-libs core-libs-dev@openjdk.org label Jan 31, 2023
@mlbridge
Copy link

mlbridge bot commented Jan 31, 2023

Webrevs

Copy link
Member

@jaikiran jaikiran left a comment

Choose a reason for hiding this comment

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

Hello Aleksei, the change looks fine to me.

The new method name handleSocketException could be a bit confusing since it might indicate this is about handling java.net.SocketException. But I think, given that this is just a test library code and that the method has a comment explaining when it's called, I think it's OK.

@openjdk
Copy link

openjdk bot commented Feb 1, 2023

@AlekseiEfimov 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:

8301367: Add exception handler method to the BaseLdapServer

Reviewed-by: jpai, vtewari, dfuchs

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

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.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Feb 1, 2023
Copy link
Contributor

@vyommani vyommani left a comment

Choose a reason for hiding this comment

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

Looks Ok to me.

Copy link
Member

@dfuch dfuch left a comment

Choose a reason for hiding this comment

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

Like Jaikiran I don't like the name of the new method much - but anything I could come up with was not much better. At least the new method gets both the socket and the exception as parameter, so that makes the name more reasonable. So approved as it stands!

@AlekseiEfimov
Copy link
Member Author

Hello Aleksei, the change looks fine to me.

The new method name handleSocketException could be a bit confusing since it might indicate this is about handling java.net.SocketException. But I think, given that this is just a test library code and that the method has a comment explaining when it's called, I think it's OK.

Like Jaikiran I don't like the name of the new method much - but anything I could come up with was not much better.

Hi Jaikiran, Daniel, Vyom,
Thanks for your reviews. I can see how the method name can be confusing, but I will stick with handleSocketException given that it:
a) has a comment describing its use cases; b) takes two parameters that give a clue on intended usage; c) has no better alternative; d) is a test library method and we can change it later if better alternative is found.

@AlekseiEfimov
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Feb 2, 2023

Going to push as commit 03b23a1.
Since your change was applied there have been 63 commits pushed to the master branch:

  • 7b6ac41: 8286876: NMT.test_unaliged_block_address_vm_assert fails if using clang toolchain
  • d097b5e: 8301508: Replace NULL with nullptr in os_cpu/linux_s390
  • c8307e3: 8301500: Replace NULL with nullptr in os_cpu/aix_ppc
  • 218223e: 8301501: Replace NULL with nullptr in os_cpu/bsd_aarch64
  • b81f0ff: 8301505: Replace NULL with nullptr in os_cpu/linux_arm
  • 42a286a: 8301511: Replace NULL with nullptr in os_cpu/linux_zero
  • ad79e49: 8301512: Replace NULL with nullptr in os_cpu/windows_aarch64
  • 8cc399b: 8301503: Replace NULL with nullptr in os_cpu/bsd_zero
  • c109dae: 8301513: Replace NULL with nullptr in os_cpu/windows_x86
  • 182d1b2: 8301507: Replace NULL with nullptr in os_cpu/linux_riscv
  • ... and 53 more: https://git.openjdk.org/jdk/compare/323813985b71c63c915cdfce5221fc65a2ad043d...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Feb 2, 2023
@openjdk openjdk bot closed this Feb 2, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Feb 2, 2023
@openjdk
Copy link

openjdk bot commented Feb 2, 2023

@AlekseiEfimov Pushed as commit 03b23a1.

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

@AlekseiEfimov AlekseiEfimov deleted the JDK-8301367_BaseLdapServer_serverSideExceptionHandler branch March 21, 2023 15:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated
4 participants