Date: Monday, January 16, 2006 @ 17:24:29
Author: marc
Path: /cvsroot/carob/carob/src
Modified: DriverSocket.cpp (1.12 -> 1.13) JavaSocket.cpp (1.32 -> 1.33)
Better fix for CAROB-51: concatenation of chunks if performed inside
DriverSocket instead of inside JavaSocket.
Less confusing, following doxygen spec, and in sync with the corresponding Java
code.
------------------+
DriverSocket.cpp | 5 +++--
JavaSocket.cpp | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
Index: carob/src/DriverSocket.cpp
diff -u carob/src/DriverSocket.cpp:1.12 carob/src/DriverSocket.cpp:1.13
--- carob/src/DriverSocket.cpp:1.12 Mon Jan 16 14:59:09 2006
+++ carob/src/DriverSocket.cpp Mon Jan 16 17:24:29 2006
@@ -84,11 +84,12 @@
s.reserve(strSize+1);
size_t sizeRead = 0;
//We must read strSize character, which can be done in several passes
- // Actually not! - MH
+ std::wstring chunk;
while ((int)sizeRead<strSize)
{
// FIXME: catch CodecException here
- sizeRead += readJavaUTF(s);
+ sizeRead += readJavaUTF(chunk);
+ s += chunk;
}
}
}
Index: carob/src/JavaSocket.cpp
diff -u carob/src/JavaSocket.cpp:1.32 carob/src/JavaSocket.cpp:1.33
--- carob/src/JavaSocket.cpp:1.32 Mon Jan 16 14:59:09 2006
+++ carob/src/JavaSocket.cpp Mon Jan 16 17:24:29 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
