[Carob-commits] CVS update of libmysequoia/src (CarobMySQL.cpp)

[csaba]

    Date: Friday, July 28, 2006 @ 11:12:54
  Author: csaba
    Path: /cvsroot/carob/libmysequoia/src

Modified: CarobMySQL.cpp (1.79 -> 1.80)

Fixes related to the changes in the ConnectionParameter (LMS-18)


----------------+
 CarobMySQL.cpp |   16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)


Index: libmysequoia/src/CarobMySQL.cpp
diff -u libmysequoia/src/CarobMySQL.cpp:1.79 
libmysequoia/src/CarobMySQL.cpp:1.80
--- libmysequoia/src/CarobMySQL.cpp:1.79        Thu Jul 20 13:51:07 2006
+++ libmysequoia/src/CarobMySQL.cpp     Fri Jul 28 11:12:54 2006
@@ -189,21 +189,19 @@
     
     try 
     {
+      std::vector<ControllerInfo> ctrls;
+
       HostTokenizer ht(host);
-      HostTokenizer::const_iterator hti = ht.begin();
-      
-      LOG4CXX_DEBUG(logger, "Connect (first host): host=" << hti->host << " 
port=" << hti->port);
-      port = hti->port;
-      ConnectionParameters connectionParameters(to_wstring(hti->host), 
hti->port, 
-        to_wstring(db), to_wstring(user), to_wstring(passwd), ht.getPolicy(), 
ConnectionParameters::DEFAULT_RETRY_INTERVAL, true, true);
-      hti++;
+      HostTokenizer::const_iterator hti;
       
-      for (; hti != ht.end(); hti++)
+      for (hti = ht.begin(); hti != ht.end(); hti++)
       {
-        connectionParameters.addController(to_wstring(hti->host), hti->port);
+        ctrls.push_back(ControllerInfo(to_wstring(hti->host), hti->port));
         LOG4CXX_DEBUG(logger, "Connect (adding host): host=" << hti->host << " 
port=" << hti->port);
       }
       
+      ConnectionParameters connectionParameters(ctrls, to_wstring(db), 
to_wstring(user), to_wstring(passwd), ht.getPolicy(), true, true);
+      
       Connection *newConnectionPtr = new Connection(connectionParameters);
       
       if (newConnectionPtr)

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