[openjpa] branch master updated (de316bc -> b714dba)

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

[openjpa] branch master updated (de316bc -> b714dba)

struberg
This is an automated email from the ASF dual-hosted git repository.

struberg pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/openjpa.git.


    from de316bc  OPENJPA-2753 add profile for MSSqlServer docker
     new fa6ce77  OPENJPA-2773 set dbcp defaults to align with commons dbcp
     new b714dba  use correct name for the db

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../org/apache/openjpa/jdbc/schema/DBCPDriverDataSource.java     | 9 +++++----
 pom.xml                                                          | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

Reply | Threaded
Open this post in threaded view
|

[openjpa] 01/02: OPENJPA-2773 set dbcp defaults to align with commons dbcp

struberg
This is an automated email from the ASF dual-hosted git repository.

struberg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openjpa.git

commit fa6ce77004739d9601bfde43e06f9446ab601698
Author: Mark Struberg <[hidden email]>
AuthorDate: Thu Feb 7 09:48:38 2019 +0100

    OPENJPA-2773 set dbcp defaults to align with commons dbcp
   
    Especially the maxIdle=0 was problematic.
    It effectively disables the whole pooling, which is counter productive.
---
 .../org/apache/openjpa/jdbc/schema/DBCPDriverDataSource.java     | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DBCPDriverDataSource.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DBCPDriverDataSource.java
index c2d28e4..eaf68b4 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DBCPDriverDataSource.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DBCPDriverDataSource.java
@@ -188,15 +188,16 @@ extends SimpleDriverDataSource implements Configurable, Closeable {
         }
 
         // set some default properties for DBCP
+        if (hasKey(dbcpProps, "maxActive") == null) {
+            dbcpProps.setProperty("maxActive", "10");
+        }
         if (hasKey(dbcpProps, "maxIdle") == null) {
-            dbcpProps.setProperty("maxIdle", "1");
+            // by default we set maxIdle to the same value as maxActive.
+            dbcpProps.setProperty("maxIdle", dbcpProps.getProperty("maxActive"));
         }
         if (hasKey(dbcpProps, "minIdle") == null) {
             dbcpProps.setProperty("minIdle", "0");
         }
-        if (hasKey(dbcpProps, "maxActive") == null) {
-            dbcpProps.setProperty("maxActive", "10");
-        }
 
         return dbcpProps;
     }

Reply | Threaded
Open this post in threaded view
|

[openjpa] 02/02: use correct name for the db

struberg
In reply to this post by struberg
This is an automated email from the ASF dual-hosted git repository.

struberg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openjpa.git

commit b714dbae1876957a56133ff2aebb5d84919af79e
Author: Mark Struberg <[hidden email]>
AuthorDate: Thu Feb 7 09:55:56 2019 +0100

    use correct name for the db
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 8d181fb..16c8d61 100644
--- a/pom.xml
+++ b/pom.xml
@@ -548,7 +548,7 @@
             <properties>
                 <connection.driver.name>org.hsqldb.jdbcDriver</connection.driver.name>
                 <!--<connection.url>jdbc:hsqldb:target/database/openjpa-hsqldb-database;create=true</connection.url>-->
-                <connection.url>jdbc:hsqldb:mem:openjpa20-hsqldb-database</connection.url>
+                <connection.url>jdbc:hsqldb:mem:openjpa22-hsqldb-database</connection.url>
                 <connection.username>sa</connection.username>
                 <connection.password />
                 <jdbc.DBDictionary />