Date: Friday, December 8, 2006 @ 18:02:08
Author: marc
Path: /cvsroot/carob/carob
Modified: include/SystemDependantDefs.hpp (1.6 -> 1.7) src/Connection.cpp
(1.97 -> 1.98) src/DriverSocket.cpp (1.21 -> 1.22)
Added references to respective CAROB issues
---------------------------------+
include/SystemDependantDefs.hpp | 2 +-
src/Connection.cpp | 12 +++++++++++-
src/DriverSocket.cpp | 4 ++--
3 files changed, 14 insertions(+), 4 deletions(-)
Index: carob/include/SystemDependantDefs.hpp
diff -u carob/include/SystemDependantDefs.hpp:1.6
carob/include/SystemDependantDefs.hpp:1.7
--- carob/include/SystemDependantDefs.hpp:1.6 Mon Dec 4 16:25:02 2006
+++ carob/include/SystemDependantDefs.hpp Fri Dec 8 18:02:08 2006
@@ -67,7 +67,7 @@
# else
# error "Could not find either MSG_NOSIGNAL nor SO_NOSIGPIPE"
// Solaris provides neither and DOES sends a SIGPIPE (see
setsockopt(3SOCKET)
- // We have a problem here...
+ // We have a problem here... See tentative solutions in CAROB-116
# endif
#endif
Index: carob/src/Connection.cpp
diff -u carob/src/Connection.cpp:1.97 carob/src/Connection.cpp:1.98
--- carob/src/Connection.cpp:1.97 Mon Dec 4 22:28:18 2006
+++ carob/src/Connection.cpp Fri Dec 8 18:02:08 2006
@@ -51,14 +51,17 @@
// When a SocketIOException occurs between these to macros, sleep and try to
// reconnect(). Sleeping time depends on the retry #. Only N retries are
// performed
+
#define FO_TRY_NTIMES(N)\
for (int foCnt=0; foCnt<N; foCnt++)\
{\
try\
{\
/* Code to monitor will go here */
+
+
#define FO_CATCH_NTIMES\
- break; /* if no exception, get out of the for */\
+ break; /* no exception means success: get out of the retry for loop */\
}\
catch (SocketIOException sioe)\
{\
@@ -1216,6 +1219,13 @@
{
throw (ConnectionException(nmce.description()));
}
+// See CAROB-108
+// catch (DriverException de)
+// {
+// logError(fctName, L"Unexpected DriverException: " +
+// de.description() + L", wrapping ");
+// throw (ConnectionException(de.description()));
+// }
// other exceptions are forwarded to caller...
}
}
Index: carob/src/DriverSocket.cpp
diff -u carob/src/DriverSocket.cpp:1.21 carob/src/DriverSocket.cpp:1.22
--- carob/src/DriverSocket.cpp:1.21 Tue Nov 28 17:07:55 2006
+++ carob/src/DriverSocket.cpp Fri Dec 8 18:02:08 2006
@@ -35,7 +35,7 @@
*this<<true;
size_t strLen = s.size();
*this<<static_cast<int32_t>(strLen);
- // FIXME: catch CodecException here
+ // FIXME: catch CodecException here. See CAROB-101
for (size_t idx=0; idx < strLen; idx+=STRING_CHUNK_SIZE)
writeJavaUTF(s.substr(idx, STRING_CHUNK_SIZE));
@@ -68,7 +68,7 @@
std::wstring chunk;
while (static_cast<int>(sizeRead)<strSize)
{
- // FIXME: catch CodecException here
+ // FIXME: catch CodecException here. See CAROB-101
sizeRead += readJavaUTF(chunk);
s += chunk;
}
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
