[8u] RFR 8243138: Enhance BaseLdapServer to support starttls extended request

[Severin Gehwolf]

On Fri, 2020-08-07 at 11:30 -0400, Zhengyu Gu wrote:
> Thanks, Severin.
> 
> > > Original bug: https://bugs.openjdk.java.net/browse/JDK-8243138
> > > Original patch: https://hg.openjdk.java.net/jdk/jdk/rev/df5a2fb15971
> > > 8u Webrev: http://cr.openjdk.java.net/~zgu/JDK-8243138-8u/webrev.00/
> > 
> > I only see context differences besides the local variable change from
> > 'var' => 'Socket'. OK.
> 
> The first conflict is caused by:
> 
> The original patch:
>           ConnWrapper connWrapper = new ConnWrapper(socket);
>  >>       try (socket) {
> 
> and 8u:
> 
>           ConnWrapper connWrapper = new ConnWrapper(socket);
>  >>       try {
> 

Yes. That's what I meant. The context around the line being patched is
different.

Thanks,
Severin