karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject karaf git commit: [KARAF-3767] Use the actual value for WHEN_EXHAUSTED_BLOCK in the JDBC generic datasource
Date Wed, 10 Jun 2015 16:52:05 GMT
Repository: karaf
Updated Branches:
  refs/heads/karaf-3.0.x 93c4b0f45 -> b56bd92f3


[KARAF-3767] Use the actual value for WHEN_EXHAUSTED_BLOCK in the JDBC generic datasource


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/b56bd92f
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/b56bd92f
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/b56bd92f

Branch: refs/heads/karaf-3.0.x
Commit: b56bd92f3684fb83fbd7858fa2cdaffead2e77c8
Parents: 93c4b0f
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
Authored: Wed Jun 10 18:37:56 2015 +0200
Committer: Jean-Baptiste Onofré <jbonofre@apache.org>
Committed: Wed Jun 10 18:51:43 2015 +0200

----------------------------------------------------------------------
 .../org/apache/karaf/jdbc/internal/datasource-generic.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/b56bd92f/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-generic.xml
----------------------------------------------------------------------
diff --git a/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-generic.xml
b/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-generic.xml
index 302ae52..98bba70 100644
--- a/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-generic.xml
+++ b/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-generic.xml
@@ -42,16 +42,16 @@
         <!--
             specifies the behavior of the borrowObject() method when the pool is exhausted:
 
-            When whenExhaustedAction is WHEN_EXHAUSTED_FAIL, borrowObject() will throw a
NoSuchElementException
-            When whenExhaustedAction is WHEN_EXHAUSTED_GROW, borrowObject() will create a
new object and return it
+            When whenExhaustedAction is WHEN_EXHAUSTED_FAIL (value is 0), borrowObject()
will throw a NoSuchElementException
+            When whenExhaustedAction is WHEN_EXHAUSTED_GROW (value is 2), borrowObject()
will create a new object and return it
             (essentially making maxActive meaningless.)
-            When whenExhaustedAction is WHEN_EXHAUSTED_BLOCK, borrowObject() will block (invoke
Object.wait()) until
+            When whenExhaustedAction is WHEN_EXHAUSTED_BLOCK (value is 1), borrowObject()
will block (invoke Object.wait()) until
             a new or idle object is available. If a positive maxWait value is supplied, then
borrowObject() will block for at most that many milliseconds, after which a NoSuchElementException
will be thrown. If maxWait is non-positive, the borrowObject() method will block indefinitely.
 
             The default whenExhaustedAction setting is WHEN_EXHAUSTED_BLOCK and the default
maxWait setting is -1.
             By default, therefore, borrowObject will block indefinitely until an idle instance
becomes available.
         -->
-        <argument value="WHEN_EXHAUSTED_BLOCK" /> <!-- whenExhaustedAction -->
+        <argument value="1" /> <!-- whenExhaustedAction -->
         <!--
             the maximum amount of time to wait for an idle object when the pool is exhausted
and whenExhaustedAction
             is WHEN_EXHAUSTED_BLOCK (otherwise ignored)
@@ -138,4 +138,4 @@
         </service-properties>
     </service>
 
-</blueprint>
\ No newline at end of file
+</blueprint>


Mime
View raw message