Date: Monday, January 16, 2006 @ 14:59:09
Author: zsolt
Path: /cvsroot/carob/carob/src
Modified: DriverSocket.cpp (1.11 -> 1.12) JavaSocket.cpp (1.31 -> 1.32)
modified readJavaUTF() to append the read string to the result.
Bug ref CAROB-51
------------------+
DriverSocket.cpp | 3 ++-
JavaSocket.cpp | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
Index: carob/src/DriverSocket.cpp
diff -u carob/src/DriverSocket.cpp:1.11 carob/src/DriverSocket.cpp:1.12
--- carob/src/DriverSocket.cpp:1.11 Mon Dec 19 16:11:14 2005
+++ carob/src/DriverSocket.cpp Mon Jan 16 14:59:09 2006
@@ -1,6 +1,6 @@
/*
* Sequoia: Database clustering technology.
- * Copyright (C) 2005 Emic Networks
+ * Copyright (C) 2005-2006 Emic Networks
* Contact: [EMAIL PROTECTED]
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -80,6 +80,7 @@
*this>>strSize;
if (strSize > 0)
{
+ s.empty();
s.reserve(strSize+1);
size_t sizeRead = 0;
//We must read strSize character, which can be done in several passes
Index: carob/src/JavaSocket.cpp
diff -u carob/src/JavaSocket.cpp:1.31 carob/src/JavaSocket.cpp:1.32
--- carob/src/JavaSocket.cpp:1.31 Wed Jan 11 20:08:38 2006
+++ carob/src/JavaSocket.cpp Mon Jan 16 14:59:09 2006
@@ -228,7 +228,7 @@
const std::string received((const char*)utfStr, lenRec);
try {
- s = fromUTF8(received);
+ s += fromUTF8(received);
} catch (CodecException) {
delete[] utfStr; throw;
}
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
