If the pool could not be found, don't throw RuntimeException but retu…

…rn null

- all callers were not prepared for RTE except one; that can handle null.

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>

appserver/connectors/connectors-internal-api/src/main/java/com/sun/appserv/connectors/internal/api/ConnectorRuntime.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2022 Contributors to the Eclipse Foundation.
+ * Copyright (c) 2022, 2023 Contributors to the Eclipse Foundation.
  * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -209,7 +209,7 @@ ClassLoader createConnectorClassLoader(String moduleDirectory, ClassLoader paren
      * Provide the configuration of the pool
      *
      * @param poolInfo connection pool info
-     * @return ResourcePool connection pool configuration
+     * @return ResourcePool connection pool configuration or null if not found
      */
     ResourcePool getConnectionPoolConfig(PoolInfo poolInfo);
 

appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/ConnectorRuntime.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2022 Contributors to Eclipse Foundation. All rights reserved.
+ * Copyright (c) 2022, 2023 Contributors to Eclipse Foundation. All rights reserved.
  * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -1012,6 +1012,7 @@ public void unregisterConnectorNamingEventListener(ConnectorNamingEventListener
 
     @Override
     public ResourcePool getConnectionPoolConfig(PoolInfo poolInfo) {
+        _logger.log(Level.FINEST, "getConnectionPoolConfig(poolInfo={0})", poolInfo);
         ResourcePool pool = ResourcesUtil.createInstance().getPoolConfig(poolInfo);
         if (pool != null) {
             return pool;
@@ -1024,7 +1025,7 @@ public ResourcePool getConnectionPoolConfig(PoolInfo poolInfo) {
                 return pool;
             }
         }
-        throw new RuntimeException("No pool found by " + poolInfo);
+        return null;
     }
 
     @Override

appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/service/ConnectorService.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Contributors to the Eclipse Foundation
+ * Copyright (c) 2022, 2023 Contributors to the Eclipse Foundation
  * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -285,11 +285,13 @@ public void switchOnMatching(String rarName, PoolInfo poolInfo) {
     public boolean checkAndLoadPool(PoolInfo poolInfo) {
         try {
             ResourcePool pool = _runtime.getConnectionPoolConfig(poolInfo);
+            if (pool == null) {
+                return false;
+            }
             DeferredResourceConfig defResConfig = getResourcesUtil().getDeferredResourceConfig(null, pool, null, null);
             return loadResourcesAndItsRar(defResConfig);
-        } catch (ConnectorRuntimeException cre) {
-            Object params[] = new Object[]{poolInfo, cre};
-            _logger.log(Level.WARNING, "unable.to.load.connection.pool", params);
+        } catch (ConnectorRuntimeException e) {
+            _logger.log(Level.WARNING, "unable.to.load.connection.pool", new Object[]{poolInfo, e});
             return false;
         }
     }