[11u] RFR (S): 8151678: com/sun/jndi/ldap/LdapTimeoutTest.java failed due to timeout on DeadServerNoTimeoutTest is incorrect

[Andrew Hughes]

On 09:31 Mon 31 Aug     , Langer, Christoph wrote:
> Hi,
> 
> may I please have a review for the backport of test fix JDK-8151678 "com/sun/jndi/ldap/LdapTimeoutTest.java failed due to timeout on DeadServerNoTimeoutTest is incorrect" as follow-up for JDK-8160768 (Add capability to custom resolve host/domain names within the default JNDI LDAP provider).
> 
> Bug: https://bugs.openjdk.java.net/browse/JDK-8151678
> Original change: https://hg.openjdk.java.net/jdk/jdk/rev/1def54255e93
> Webrev: http://cr.openjdk.java.net/~clanger/webrevs/8151678.11u.0/
> 
> I had the following Rejects:
> src/java.naming/share/classes/com/sun/jndi/ldap/DefaultLdapDnsProvider.java:
>     needed manual resolve, also copyright year was different
> LdapDnsProviderService.java:
>     File is in a different location in 11u, so I needed to manually resolve it:
>     java.naming/share/classes/com/sun/jndi/ldap/LdapDnsProviderService.java -> jdk.naming.ldap/share/classes/com/sun/jndi/ldap/dns/LdapDnsProviderService.java
> ProblemList.txt:
>     Needed a manual resolve
> 
> Thanks
> Christoph
> 

The only reason the copyright years were different here is because,
for some reason, they were altered in the backport of JDK-8160768.
This, in turn, has caused some confusion in reviewing this patch for
8u [0] [1], because the copyright changes are needed in 15u & 8u, but
not 11u.

Can we please not include additional changes in backports, unless necessary?

[0] https://mail.openjdk.java.net/pipermail/jdk8u-dev/2020-September/012634.html
[1] https://mail.openjdk.java.net/pipermail/jdk8u-dev/2020-September/012651.html

Thanks,
-- 
Andrew :)

Senior Free Java Software Engineer
OpenJDK Package Owner
Red Hat, Inc. (http://www.redhat.com)

PGP Key: ed25519/0xCFDA0F9B35964222 (hkp://keys.gnupg.net)
Fingerprint = 5132 579D D154 0ED2 3E04  C5A0 CFDA 0F9B 3596 4222