Skip to content

Conversation

@Pooja-DP
Copy link

@Pooja-DP Pooja-DP commented Nov 3, 2025

This pull request contains a backport of commit openjdk/jdk17u@39a6bf2 from the https://github.com/openjdk/jdk17u

Bug Ref: https://bugs.openjdk.org/browse/JDK-8290368

Signed-off-by: Pooja.D.P1 Pooja.D.P1@ibm.com


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
  • JDK-8290368 needs maintainer approval
  • Change requires CSR request JDK-8360532 to be approved

Issues

  • JDK-8290368: Introduce LDAP and RMI protocol-specific object factory filters to JNDI implementation (Bug - P3)
  • JDK-8360532: Introduce LDAP and RMI protocol-specific object factory filters to JNDI implementation (CSR)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk11u-dev.git pull/3111/head:pull/3111
$ git checkout pull/3111

Update a local copy of the PR:
$ git checkout pull/3111
$ git pull https://git.openjdk.org/jdk11u-dev.git pull/3111/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3111

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk11u-dev/pull/3111.diff

Using Webrev

Link to Webrev Comment

Signed-off-by: Pooja.D.P <Pooja.D.P1@ibm.com>
@bridgekeeper
Copy link

bridgekeeper bot commented Nov 3, 2025

👋 Welcome back Pooja-DP! 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
Copy link

openjdk bot commented Nov 3, 2025

❗ This change is not yet ready to be integrated.
See the Progress checklist in the description for automated requirements.

@openjdk openjdk bot changed the title Backport 39a6bf2158c2f35399c6739e4b9578f13ea6b7e4 8290368: Introduce LDAP and RMI protocol-specific object factory filters to JNDI implementation Nov 3, 2025
@openjdk
Copy link

openjdk bot commented Nov 3, 2025

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport Port of a pull request already in a different code base rfr Pull request is ready for review labels Nov 3, 2025
@mlbridge
Copy link

mlbridge bot commented Nov 3, 2025

Webrevs

@Pooja-DP
Copy link
Author

Pooja-DP commented Nov 6, 2025

Hi team, Can anyone please take a look on my PR?

@Pooja-DP
Copy link
Author

Pooja-DP commented Nov 6, 2025

@RealCLanger - Could you please review my PR?

@RealCLanger
Copy link
Contributor

@RealCLanger - Could you please review my PR?

Sorry, not working on JDK11 any more, you need to find somebody else.

@Pooja-DP
Copy link
Author

Pooja-DP commented Nov 7, 2025

@phohensee - Could you please take a look on my PR?

1 similar comment
@Pooja-DP
Copy link
Author

@phohensee - Could you please take a look on my PR?

Copy link
Member

@gnu-andrew gnu-andrew left a comment

Choose a reason for hiding this comment

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

It seems that when 8244473 was backported to 11u, documentation changes were not included so I think it is correct to include them here, along with fixing the ordering in java.security caused by patches being applied in a different order as far as I can see.

There are still some conflict hunks present in src/java.naming/share/classes/module-info.java and a couple of bits from 8244473 still missing:

--- src/java.naming/share/classes/module-info.java      2025-12-03 09:33:23.798486609 +0000
+++ ../jdk/src/java.naming/share/classes/module-info.java       2025-12-03 01:34:51.274570322 +0000
@@ -29,11 +29,11 @@
  * Common standard JNDI environment properties that may be supported
  * by JNDI providers are defined and documented in
  * {@link javax.naming.Context}. Specific JNDI provider implementations
- * may also support other environment properties, which are specific
+ * may also support other environment or system properties, which are specific
  * to their implementation.
  *
  * @implNote
- * The following implementation specific properties are supported by the
+ * The following implementation specific environment properties are supported by the
  * default LDAP Naming Service Provider implementation in the JDK:
  * <ul>
  *     <li>{@code java.naming.ldap.factory.socket}:
@@ -86,8 +86,6 @@
  *         channel binding information to the server.
  *     </li>
  * </ul>
-<<<<<<< HEAD
-=======
  * <p>The following implementation specific system properties are supported by the
  * default LDAP Naming Service Provider implementation in the JDK:
  * <ul>

If you can fix this up, this should be ready to go.

What testing has been done with this change?

@gnu-andrew
Copy link
Member

Also please go to https://github.com/Pooja-DP/jdk11u-dev/actions and enable GitHub Actions as you are not running the testing on this pull request.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Port of a pull request already in a different code base rfr Pull request is ready for review

Development

Successfully merging this pull request may close these issues.

3 participants