Fixes #21355: Race condition in ConnectionPool (connectors-runtime) (#22086)

Author: h2002044

appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/ConnectionPool.java

@@ -422,11 +422,13 @@ public ResourceHandle getResource(ResourceSpec spec, ResourceAllocator alloc, Tr
 
                 if (!blocked) {
                     //add to wait-queue
-                    Object waitMonitor = waitQueue.addToQueue();
+                    Object waitMonitor = new Object();
                     if (poolLifeCycleListener != null) {
                         poolLifeCycleListener.connectionRequestQueued();
                     }
                     synchronized (waitMonitor) {
+                        waitQueue.addToQueue(waitMonitor);
+
                         try {
                             logFine("Resource Pool: getting on wait queue");
                             waitMonitor.wait(remainingWaitTime);
@@ -450,8 +452,9 @@ public ResourceHandle getResource(ResourceSpec spec, ResourceAllocator alloc, Tr
                     }
                 } else {
                     //add to reconfig-wait-queue
-                    Object reconfigWaitMonitor = reconfigWaitQueue.addToQueue();
+                    Object reconfigWaitMonitor = new Object();
                     synchronized (reconfigWaitMonitor) {
+                        reconfigWaitQueue.addToQueue(reconfigWaitMonitor);
                         try {
                             if(reconfigWaitTime > 0){
                                 if(_logger.isLoggable(Level.FINEST)) {

appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/waitqueue/DefaultPoolWaitQueue.java

@@ -70,11 +70,9 @@ public synchronized int getQueueLength() {
         return list.size();
     }
 
-    public synchronized Object addToQueue() {
+    public synchronized void addToQueue(Object waitMonitor) {
 
-        Object waitMonitor = new Object();
         list.addLast(waitMonitor);
-        return waitMonitor;
     }
 
     public synchronized boolean removeFromQueue(Object o) {

appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/waitqueue/PoolWaitQueue.java

@@ -61,9 +61,9 @@ public interface PoolWaitQueue {
     /**
      * resource requesting thread will be added to queue<br>
      * and the object on which it is made to wait is returned
-     * @return Object
+     * @param o Object 
      */
-    Object addToQueue();
+    void addToQueue(Object o);
 
     /**
      * removes the specified object (resource request) from the queue