[Carob-commits] CVS update of carob/src (ConnectionParameters.cpp)

[gilles]

    Date: Wednesday, November 29, 2006 @ 16:12:43
  Author: gilles
    Path: /cvsroot/carob/carob/src

Modified: ConnectionParameters.cpp (1.25 -> 1.26)

Set ping delay and controller timeout to defaults values if given ones are 
unrelevant (<=0)


--------------------------+
 ConnectionParameters.cpp |   25 ++++++++++++++++---------
 1 files changed, 16 insertions(+), 9 deletions(-)


Index: carob/src/ConnectionParameters.cpp
diff -u carob/src/ConnectionParameters.cpp:1.25 
carob/src/ConnectionParameters.cpp:1.26
--- carob/src/ConnectionParameters.cpp:1.25     Tue Nov 28 17:07:55 2006
+++ carob/src/ConnectionParameters.cpp  Wed Nov 29 16:12:43 2006
@@ -50,17 +50,24 @@
     int controllerTimeoutInMs /* = DEFAULT_CONTROLLER_TIMEOUT */,
     bool persistentConnections /*= DEFAULT_CONNECTION_PERSISTENCY */,
     bool retrieveSQLWarnings /*= DEFAULT_RETRIEVE_SQL_WARNINGS */)
-        throw (ConnectionException, UnexpectedException) :
-            database_name(checkDatabaseName(db)),
-            user_name(uname),
-            user_pass(upass),
-            connect_policy(cp),
-            ping_delay_in_ms(pingDelayInMs),
-            controller_timeout_in_ms(controllerTimeoutInMs),
-            persistent_connections(persistentConnections),
-            retrieve_sql_warnings(retrieveSQLWarnings)
+
+    throw (ConnectionException, UnexpectedException) :
+
+    database_name(checkDatabaseName(db)),
+    user_name(uname),
+    user_pass(upass),
+    connect_policy(cp),
+    ping_delay_in_ms(pingDelayInMs),
+    controller_timeout_in_ms(controllerTimeoutInMs),
+    persistent_connections(persistentConnections),
+    retrieve_sql_warnings(retrieveSQLWarnings)
 {
   controller_list = ctrls;
+  // Put default values if given delay/timeout are unrelevant
+  if (ping_delay_in_ms <= 0)
+    ping_delay_in_ms = DEFAULT_PING_DELAY;
+  if (controller_timeout_in_ms <= 0)
+    controller_timeout_in_ms = DEFAULT_CONTROLLER_TIMEOUT;
 }
 
 ConnectionParameters::~ConnectionParameters()

_______________________________________________
Carob-commits mailing list
Carob-commits@lists.forge.continuent.org
https://forge.continuent.org/mailman/listinfo/carob-commits