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

[Andrew Hughes]

On 11:25 Tue 08 Sep     , Zhengyu Gu wrote:
> Hi Andrew,
> 
> On 9/7/20 2:10 AM, Andrew Hughes wrote:
> > On 09:24 Sat 29 Aug     , Zhengyu Gu wrote:
> > > I would like to backport this patch for parity with Oracle 8u271.
> > > 
> > 
> > There seem to be a couple of additional copyright header changes in
> > this backport, in
> > src/share/classes/com/sun/jndi/ldap/DefaultLdapDnsProvider.java and
> > src/share/classes/com/sun/jndi/ldap/LdapDnsProviderService.java. Where
> > do these come from?
> 
> They came from the original JDK-8151678 patch [1]
>

Ok, I would usually say follow the closest version for backport, to avoid
duplicating work, possibly differently (see [0]), but this looks like a bad
backport in 11u. They omitted these copyright changes for this patch [1],
because they altered these files in the backport of 8160768 [2].

I guess you could say that was because the backport in 8u was not based
on 11u's JD-8160768 either, but I think their decision in 11u was wrong here.

In future, please try and base backports on the closest version and feel
free to raise any issues you think are wrong in that backport on the original
thread.

> 
> > 
> > With the changes to LdapTimeoutTest.java, .copy() is not the same
> > as .toCompletableFuture(), as the former creates a new CompleteableFuture
> > (via newInCompleteFuture(), another 9u addition) that relays the
> > result of the original, while the latter would appear to be just the
> > same as returning starting directly. A closer equivalent would appear
> > to be starting.thenApply((x) -> x), as suggested in the documentation of
> > copy().
> Updated: http://cr.openjdk.java.net/~zgu/JDK-8151678-8u/webrev.01/
> 
> > 
> > Do the amended tests complete successfully?
> > 
> Yes, before and after your suggested change.
> 
> Test:
>   Reran jdk_other.
> 
> Thanks,
> 
> -Zhengyu
> 
> 
> [1] https://hg.openjdk.java.net/jdk/jdk/rev/1def54255e93
> > 
> 

Thanks. This looks good now. Please flag with jdk8-critical-request.

[0] https://wiki.openjdk.java.net/display/jdk8u/Main
[1] https://mail.openjdk.java.net/pipermail/jdk-updates-dev/2020-August/003706.html
[2] https://hg.openjdk.java.net/jdk-updates/jdk11u/rev/d3968414c142
-- 
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