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

[Zhengyu Gu]

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 {


-Zhengyu

> 
> Patch looks good to me.
> 
> Thanks,
> Severin
> 
>> Test:
>>     jdk_other
>>
>> Thanks,
>>
>> -Zhengyu
>>
>>
>> [1]
>> diff -r 19be2797f698 -r a78123a1f329
>> test/com/sun/jndi/ldap/lib/BaseLdapServer.java
>> --- a/test/com/sun/jndi/ldap/lib/BaseLdapServer.java	Thu Apr 23 16:36:05
>> 2020 +0800
>> +++ b/test/com/sun/jndi/ldap/lib/BaseLdapServer.java	Tue Jun 30 10:37:07
>> 2020 -0400
>> @@ -119,6 +119,7 @@
>>            // No need to close socket's streams separately, they will be
>> closed
>>            // automatically when `socket.close()` is called
>>            beforeConnectionHandled(socket);
>> +        ConnWrapper connWrapper = new ConnWrapper(socket);
>>            try {
>>                OutputStream out = socket.getOutputStream();
>>                InputStream in = socket.getInputStream();
>> @@ -154,7 +155,7 @@
>>                    }
>>                    handleRequestEx(socket, new LdapMessage(request), out,
>> connWrapper);
>>                    if (connWrapper.updateRequired()) {
>> -                    var wrapper = connWrapper.getWrapper();
>> +                    Socket wrapper = connWrapper.getWrapper();
>>                        in = wrapper.getInputStream();
>>                        out = wrapper.getOutputStream();
>>                        connWrapper.clearFlag();
>>
>>
>>
>