Merge pull request #103 from pavelhoral/upgrade-rxjava

Upgrade rxjava and fix connection handler startup wait

Author: pavelhoral

opendj-core/pom.xml

@@ -52,13 +52,13 @@
         <dependency>
             <groupId>org.reactivestreams</groupId>
             <artifactId>reactive-streams</artifactId>
-            <version>1.0.0</version>
+            <version>1.0.3</version>
         </dependency>
 
         <dependency>
             <groupId>io.reactivex.rxjava2</groupId>
             <artifactId>rxjava</artifactId>
-            <version>2.0.0</version>
+            <version>2.2.21</version>
         </dependency>
 
         <dependency>

opendj-server-legacy/src/main/java/org/forgerock/opendj/reactive/LDAPConnectionHandler2.java

@@ -13,6 +13,7 @@
  *
  * Copyright 2006-2010 Sun Microsystems, Inc.
  * Portions Copyright 2011-2016 ForgeRock AS.
+ * Portions Copyright 2026 Wren Security
  */
 package org.forgerock.opendj.reactive;
 
@@ -673,6 +674,22 @@ public Stream<Response> handle(final LDAPClientContext context,
         logger.info(NOTE_CONNHANDLER_STARTED_LISTENING, handlerName);
     }
 
+    @Override
+    public void start() {
+        // The Directory Server start process should only return when the connection
+        // handlers port are fully opened and working. The start method therefore needs
+        // to wait for the created thread to actually start accepting connections
+        synchronized (waitListen) {
+            super.start();
+
+            try {
+                waitListen.wait();
+            } catch (InterruptedException e) {
+                // If something interrupted the start its probably better to return ASAP.
+            }
+        }
+    }
+
     /**
      * Operates in a loop, accepting new connections and ensuring that requests on those connections are handled
      * properly.
@@ -711,16 +728,16 @@ public void run() {
             }
 
             try {
+                // If we have gotten here, then we are about to start listening
+                // for the first time since startup or since we were previously disabled.
+                startListener();
+                lastIterationFailed = false;
+
                 // At this point, the connection Handler either started correctly or failed
                 // to start but the start process should be notified and resume its work in any cases.
                 synchronized (waitListen) {
                     waitListen.notify();
                 }
-
-                // If we have gotten here, then we are about to start listening
-                // for the first time since startup or since we were previously disabled.
-                startListener();
-                lastIterationFailed = false;
             } catch (Exception e) {
                 // Clean up the messed up HTTP server
                 stopListener();

opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPConnectionHandler.java

@@ -804,10 +804,9 @@ public void processServerShutdown(LocalizableMessage reason)
   @Override
   public void start()
   {
-    // The Directory Server start process should only return
-    // when the connection handlers port are fully opened
-    // and working. The start method therefore needs to wait for
-    // the created thread to
+    // The Directory Server start process should only return when the connection
+    // handlers port are fully opened and working. The start method therefore needs
+    // to wait for the created thread to actually start accepting connections
     synchronized (waitListen)
     {
       super.start();
@@ -818,8 +817,7 @@ public void start()
       }
       catch (InterruptedException e)
       {
-        // If something interrupted the start its probably better
-        // to return ASAP.
+        // If something interrupted the start its probably better to return ASAP.
       }
     }
   }

pom.xml

@@ -91,7 +91,7 @@
     </repositories>
 
     <properties>
-        <pgpVerifyKeysVersion>1.9.3</pgpVerifyKeysVersion>
+        <pgpVerifyKeysVersion>1.9.7</pgpVerifyKeysVersion>
 
         <product.name>Wren:DS</product.name>
         <product.name.lowercase>wrends</product.name.lowercase>