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

Zhengyu Gu zgu at redhat.com
Tue Jul 14 12:47:53 UTC 2020


I would like to backport this patch for parity with Oracle 8u271.

The original patch does not apply cleanly, but conflicts are minors [1].

1) JDK-8217606 backport converted jdk9 style try-with-resource to 
try-catch-finally, that caused the first conflict.
2) jdk8 does not support 'var' language feature.

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/

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();





More information about the jdk8u-dev mailing list