Date: Wednesday, January 17, 2007 @ 17:25:45
Author: marc
Path: /cvsroot/carob/carob/include
Modified: JavaSocket.hpp (1.39 -> 1.40)
- Exported tryUTF8locale() from Common.hpp to JavaSocket.cpp (where it should
be moved later)
- JavaSocket now has its private ut8_codec to talk with the controller.
- JavaSocket & DriverSocket ctors now throw CodecException, caught in
ControllerInfo.cpp
- DriverSocket ctor never throws ConnectionException: removed from signature
CAROB-79
----------------+
JavaSocket.hpp | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletion(-)
Index: carob/include/JavaSocket.hpp
diff -u carob/include/JavaSocket.hpp:1.39 carob/include/JavaSocket.hpp:1.40
--- carob/include/JavaSocket.hpp:1.39 Tue Jan 16 10:35:08 2007
+++ carob/include/JavaSocket.hpp Wed Jan 17 17:25:45 2007
@@ -50,7 +50,7 @@
/**
* Default constructor - No connection here, just creates and empty socket
*/
- JavaSocket();
+ JavaSocket() throw (CodecException);
/**
* Destructor for disconnection - closes the socket.
* @throws SocketIOException
@@ -227,6 +227,13 @@
const throw (SocketIOException, UnexpectedException);
private:
+#ifdef CAROB_USE_ICONV
+ // needs to be mutable because of locking
+ mutable CarobNS::IconvCodec utf8_codec;
+#else
+ const CarobNS::MBSCodec utf8_codec;
+#endif
+
/** Socket file descriptor */
int socket_fd;
/** true if the socket is connected to a host */
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
