Fixed ICE-7169 and ICE-7375 - add option to specify if batch requests flushed with the communicator/connection should be compressed

1 files changed, 20 insertions, 5 deletions

diff --git a/csharp/src/Ice/Reference.cs b/csharp/src/Ice/Reference.cs
index cfd1019cc74..f786dd5e18e 100644
--- a/csharp/src/Ice/Reference.cs
+++ b/csharp/src/Ice/Reference.cs
@@ -237,6 +237,25 @@ namespace IceInternal
             }
         }
 
+        public bool getCompressOverride(out bool compress)
+        {
+            DefaultsAndOverrides defaultsAndOverrides = getInstance().defaultsAndOverrides();
+            if(defaultsAndOverrides.overrideCompress)
+            {
+                compress = defaultsAndOverrides.overrideCompressValue;
+            }
+            else if(overrideCompress_)
+            {
+                compress = compress_;
+            }
+            else
+            {
+                compress = false;
+                return false;
+            }
+            return true;
+        }
+
         public abstract bool isIndirect();
         public abstract bool isWellKnown();
 
@@ -709,7 +728,7 @@ namespace IceInternal
 
             _fixedConnection.throwException(); // Throw in case our connection is already destroyed.
 
-            bool compress;
+            bool compress = false;
             if(defaultsAndOverrides.overrideCompress)
             {
                 compress = defaultsAndOverrides.overrideCompressValue;
@@ -718,10 +737,6 @@ namespace IceInternal
             {
                 compress = compress_;
             }
-            else
-            {
-                compress = _fixedConnection.endpoint().compress();
-            }
 
             return proxy.iceSetRequestHandler(new ConnectionRequestHandler(this, _fixedConnection, compress));
         }