summaryrefslogtreecommitdiff
path: root/cppe/src/IceE/Outgoing.cpp
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2005-12-13 17:14:48 +0000
committerDwayne Boone <dwayne@zeroc.com>2005-12-13 17:14:48 +0000
commit5e2761ef0fe9a7c14f02abbdd2076620af47fe6f (patch)
treeb17bda7037fd85782813712248f92efe04a8ccdf /cppe/src/IceE/Outgoing.cpp
parentRemoved sync from Outgoing for blocking sends (diff)
downloadice-5e2761ef0fe9a7c14f02abbdd2076620af47fe6f.tar.bz2
ice-5e2761ef0fe9a7c14f02abbdd2076620af47fe6f.tar.xz
ice-5e2761ef0fe9a7c14f02abbdd2076620af47fe6f.zip
Fixed ifdef from last commit
Diffstat (limited to 'cppe/src/IceE/Outgoing.cpp')
-rw-r--r--cppe/src/IceE/Outgoing.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/cppe/src/IceE/Outgoing.cpp b/cppe/src/IceE/Outgoing.cpp
index c5561b62c7d..107dd2c4054 100644
--- a/cppe/src/IceE/Outgoing.cpp
+++ b/cppe/src/IceE/Outgoing.cpp
@@ -116,8 +116,8 @@ IceInternal::Outgoing::invoke()
#ifndef ICEE_PURE_BLOCKING_CLIENT
#ifdef ICEE_BLOCKING_CLIENT
if(!_connection->blocking())
- {
#endif
+ {
//
// We let all exceptions raised by sending directly
// propagate to the caller, because they can be retried
@@ -189,9 +189,12 @@ IceInternal::Outgoing::invoke()
}
}
}
-#ifdef ICEE_BLOCKING_CLIENT
}
+#ifdef ICEE_BLOCKING_CLIENT
else
+#endif
+#endif
+#ifdef ICEE_BLOCKING_CLIENT
{
_connection->sendRequest(&_os, &_is, this);
if(!_exception.get())
@@ -200,7 +203,6 @@ IceInternal::Outgoing::invoke()
}
}
#endif
-#endif
if(_exception.get())
{
//