summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorMarc Laukien <marc@zeroc.com>2002-05-08 14:38:47 +0000
committerMarc Laukien <marc@zeroc.com>2002-05-08 14:38:47 +0000
commit0458e5dfd2491e2464ae431d54572b6e78006375 (patch)
tree049f600f67a457e2cb1ef734efc32b2984ae484b /cpp/src
parentDefaultsAndOverwrites (diff)
downloadice-0458e5dfd2491e2464ae431d54572b6e78006375.tar.bz2
ice-0458e5dfd2491e2464ae431d54572b6e78006375.tar.xz
ice-0458e5dfd2491e2464ae431d54572b6e78006375.zip
overwrites
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Ice/Connection.cpp17
1 files changed, 17 insertions, 0 deletions
diff --git a/cpp/src/Ice/Connection.cpp b/cpp/src/Ice/Connection.cpp
index 3cc5c9a757c..dfafdd59a45 100644
--- a/cpp/src/Ice/Connection.cpp
+++ b/cpp/src/Ice/Connection.cpp
@@ -13,6 +13,7 @@
#include <Ice/LoggerUtil.h>
#include <Ice/Properties.h>
#include <Ice/TraceUtil.h>
+#include <Ice/DefaultsAndOverwrites.h>
#include <Ice/Transceiver.h>
#include <Ice/ThreadPool.h>
#include <Ice/ObjectAdapter.h>
@@ -116,6 +117,11 @@ IceInternal::Connection::sendRequest(Outgoing* out, bool oneway, bool comp)
copy(p, p + sizeof(Int), os->b.begin() + headerSize);
}
+ if (_defaultsAndOverwrites->overwriteCompress)
+ {
+ comp = _defaultsAndOverwrites->overwriteCompressValue;
+ }
+
if (comp)
{
//
@@ -244,6 +250,11 @@ IceInternal::Connection::flushBatchRequest(bool comp)
_batchStream.i = _batchStream.b.begin();
+ if (_defaultsAndOverwrites->overwriteCompress)
+ {
+ comp = _defaultsAndOverwrites->overwriteCompressValue;
+ }
+
if (comp)
{
//
@@ -643,6 +654,11 @@ IceInternal::Connection::message(BasicStream& stream, const ThreadPoolPtr& threa
return;
}
+ if (_defaultsAndOverwrites->overwriteCompress)
+ {
+ comp = _defaultsAndOverwrites->overwriteCompressValue;
+ }
+
if (comp)
{
//
@@ -759,6 +775,7 @@ IceInternal::Connection::Connection(const InstancePtr& instance,
_adapter(adapter),
_logger(_instance->logger()),
_traceLevels(_instance->traceLevels()),
+ _defaultsAndOverwrites(_instance->defaultsAndOverwrites()),
_nextRequestId(1),
_requestsHint(_requests.end()),
_batchStream(_instance),