summaryrefslogtreecommitdiff
path: root/qpid/cpp/src
diff options
context:
space:
mode:
authorClifford Allan Jansen <cliffjansen@apache.org>2012-05-17 23:56:34 +0000
committerClifford Allan Jansen <cliffjansen@apache.org>2012-05-17 23:56:34 +0000
commit660c4c1ad6daf3eb27b0894fc8346ee7ebd812a5 (patch)
tree2ed9547103a9a32575d272e6d7a99c722035ade0 /qpid/cpp/src
parentf9ede019aff893addfc8a056da8681c59ad53959 (diff)
downloadqpid-python-660c4c1ad6daf3eb27b0894fc8346ee7ebd812a5.tar.gz
QPID-4008: added check for INVALID_SOCKET similar to Linux implementation
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1339927 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
-rw-r--r--qpid/cpp/src/qpid/sys/windows/Socket.cpp17
1 files changed, 10 insertions, 7 deletions
diff --git a/qpid/cpp/src/qpid/sys/windows/Socket.cpp b/qpid/cpp/src/qpid/sys/windows/Socket.cpp
index b085f67539..a4374260cc 100644
--- a/qpid/cpp/src/qpid/sys/windows/Socket.cpp
+++ b/qpid/cpp/src/qpid/sys/windows/Socket.cpp
@@ -266,14 +266,17 @@ int Socket::getError() const
void Socket::setTcpNoDelay() const
{
- int flag = 1;
- int result = setsockopt(impl->fd,
- IPPROTO_TCP,
- TCP_NODELAY,
- (char *)&flag,
- sizeof(flag));
- QPID_WINSOCK_CHECK(result);
+ SOCKET& socket = impl->fd;
nodelay = true;
+ if (socket != INVALID_SOCKET) {
+ int flag = 1;
+ int result = setsockopt(impl->fd,
+ IPPROTO_TCP,
+ TCP_NODELAY,
+ (char *)&flag,
+ sizeof(flag));
+ QPID_WINSOCK_CHECK(result);
+ }
}
inline IOHandlePrivate* IOHandlePrivate::getImpl(const qpid::sys::IOHandle &h)