Date: Tuesday, February 6, 2007 @ 18:52:29
Author: marc
Path: /cvsroot/carob/carob
Modified: include/JavaSocket.hpp (1.44 -> 1.45) src/JavaSocket.cpp (1.88
-> 1.89)
Renamed closeSocket() method to closeSystemSocket() to stop confusion
with Connection::closeSocket() (think "grep")
------------------------+
include/JavaSocket.hpp | 4 ++--
src/JavaSocket.cpp | 5 ++---
2 files changed, 4 insertions(+), 5 deletions(-)
Index: carob/include/JavaSocket.hpp
diff -u carob/include/JavaSocket.hpp:1.44 carob/include/JavaSocket.hpp:1.45
--- carob/include/JavaSocket.hpp:1.44 Mon Jan 29 17:46:36 2007
+++ carob/include/JavaSocket.hpp Tue Feb 6 18:52:29 2007
@@ -85,11 +85,11 @@
bool connectTo(const SocketAddress& addr)
throw (ConnectionException, UnexpectedException);
/**
- * Closes connection.
+ * Closes TCP socket. Why public?
* @return true if the socket was successfully closed
* @throws SocketIOException
*/
- virtual bool closeSocket() throw (SocketIOException, UnexpectedException);
+ virtual bool closeSystemSocket() throw (SocketIOException,
UnexpectedException);
/**
* Writes a UTF-8 encoded wstring to the socket. This is NOT Java's
Index: carob/src/JavaSocket.cpp
diff -u carob/src/JavaSocket.cpp:1.88 carob/src/JavaSocket.cpp:1.89
--- carob/src/JavaSocket.cpp:1.88 Wed Jan 31 15:06:02 2007
+++ carob/src/JavaSocket.cpp Tue Feb 6 18:52:29 2007
@@ -219,11 +219,10 @@
logDebug(fctName, L"About to close socket...");
try
{
- closeSocket();
+ closeSystemSocket();
}
catch (SocketIOException e)
{
- if (isWarnEnabled())
logInfo(fctName, L"Socket closure failed. Exception is: " +
e.description());
}
}
@@ -352,7 +351,7 @@
}
}
-bool JavaSocket::closeSocket() throw (SocketIOException, UnexpectedException)
+bool JavaSocket::closeSystemSocket() throw (SocketIOException,
UnexpectedException)
{
const wchar_t fctName[] = L"JavaSocket::closeSocket";
if (isValid())
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
