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

[Langer, Christoph]

Hi Andrew,

> > I had the following Rejects:
> >
> src/java.naming/share/classes/com/sun/jndi/ldap/DefaultLdapDnsProvider.j
> ava:
> >     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/LdapDnsProviderSer
> vice.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?

Well, I'm definitely a big fan of the policy of not altering backports in any way unless absolutely necessary. However, in the case of the backport of JDK-8160768, I had to add quite some significant amount of additional code and had to reshuffle things such that updating copyright years just seemed to be the correct thing to do here.

Also, why would that cause confusion in the 8u backport of JDK- 8151678? Did you take the 11u change as the base? I recall that for JDK-8160768 the backport to 11u was significantly different to the backport for 8u and 8u seemed to be more in line with its original in head jdk/jdk.

Cheers
Christoph


> 
> [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