[AMQ-9820]: More reliable fix to avoid stale connections to remain in the pool. And better pool handling on start exception

Author: jeanouii

activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/ConnectionPool.java

@@ -125,6 +125,7 @@ public void start() throws JMSException {
                 connection.start();
             } catch (JMSException e) {
                 started.set(false);
+                setHasExpired(true);
                 if (isReconnectOnException()) {
                     close();
                 }

activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/PooledConnection.java

@@ -92,7 +92,15 @@ public void close() throws JMSException {
     @Override
     public void start() throws JMSException {
         assertNotClosed();
-        pool.start();
+        try {
+            pool.start();
+        } catch (JMSException e) {
+            try {
+                close();
+            } catch (JMSException ignored) {
+            }
+            throw e;
+        }
     }
 
     @Override

activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/PooledConnectionFactory.java

@@ -129,12 +129,7 @@ public void destroyObject(ConnectionKey connectionKey, PooledObject<ConnectionPo
                     @Override
                     public boolean validateObject(ConnectionKey connectionKey, PooledObject<ConnectionPool> pooledObject) {
                         ConnectionPool connection = pooledObject.getObject();
-                        if (connection == null || connection.getConnection() == null) {
-                            LOG.trace("Connection has been closed and will be destroyed: {}", connection);
-                            return false;
-                        }
-
-                        if (connection.expiredCheck()) {
+                        if (connection != null && connection.expiredCheck()) {
                             LOG.trace("Connection has expired: {} and will be destroyed", connection);
                             return false;
                         }