[CONJ-780] OSGi DataSourceFactory implementation correction

mariadb-corporation · Apr 15, 2020 · 0e6dc64 · 0e6dc64
1 parent f0e4180
commit 0e6dc64
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/src/main/java/org/mariadb/jdbc/internal/osgi/MariaDbDataSourceFactory.java b/src/main/java/org/mariadb/jdbc/internal/osgi/MariaDbDataSourceFactory.java
@@ -66,9 +66,9 @@ public class MariaDbDataSourceFactory implements DataSourceFactory {
   @Override
   public DataSource createDataSource(Properties props) throws SQLException {
     if (props != null
-        || props.containsKey(JDBC_MIN_POOL_SIZE)
-        || props.containsKey(JDBC_MAX_POOL_SIZE)
-        || props.containsKey(JDBC_MAX_IDLE_TIME)) {
+        && (props.containsKey(JDBC_MIN_POOL_SIZE)
+            || props.containsKey(JDBC_MAX_POOL_SIZE)
+            || props.containsKey(JDBC_MAX_IDLE_TIME))) {
       return createPoolDataSource(props);
     } else {
       return createBasicDataSource(props);
@@ -79,9 +79,9 @@ public DataSource createDataSource(Properties props) throws SQLException {
   public ConnectionPoolDataSource createConnectionPoolDataSource(Properties props)
       throws SQLException {
     if (props != null
-        || props.containsKey(JDBC_MIN_POOL_SIZE)
-        || props.containsKey(JDBC_MAX_POOL_SIZE)
-        || props.containsKey(JDBC_MAX_IDLE_TIME)) {
+        && (props.containsKey(JDBC_MIN_POOL_SIZE)
+            || props.containsKey(JDBC_MAX_POOL_SIZE)
+            || props.containsKey(JDBC_MAX_IDLE_TIME))) {
       return createPoolDataSource(props);
     } else {
       return createBasicDataSource(props);
@@ -91,9 +91,9 @@ public ConnectionPoolDataSource createConnectionPoolDataSource(Properties props)
   @Override
   public XADataSource createXADataSource(Properties props) throws SQLException {
     if (props != null
-        || props.containsKey(JDBC_MIN_POOL_SIZE)
-        || props.containsKey(JDBC_MAX_POOL_SIZE)
-        || props.containsKey(JDBC_MAX_IDLE_TIME)) {
+        && (props.containsKey(JDBC_MIN_POOL_SIZE)
+            || props.containsKey(JDBC_MAX_POOL_SIZE)
+            || props.containsKey(JDBC_MAX_IDLE_TIME))) {
       return createPoolDataSource(props);
     } else {
       return createBasicDataSource(props);