Proxy marshal fixes

4 files changed, 8 insertions, 4 deletions

diff --git a/swift/src/Ice/OutputStream.swift b/swift/src/Ice/OutputStream.swift
index c23a802cc72..38e27e5536a 100644
--- a/swift/src/Ice/OutputStream.swift
+++ b/swift/src/Ice/OutputStream.swift
@@ -7,7 +7,7 @@ import IceObjc
 public class OutputStream {
     private var buf: Buffer
     private var communicator: Communicator
-    private var encoding: EncodingVersion
+    var encoding: EncodingVersion
     private var encoding_1_0: Bool
     private var format: FormatType = FormatType.DefaultFormat
 
diff --git a/swift/src/Ice/Proxy.swift b/swift/src/Ice/Proxy.swift
index 97eefa9301e..a99b1b03e6a 100644
--- a/swift/src/Ice/Proxy.swift
+++ b/swift/src/Ice/Proxy.swift
@@ -599,7 +599,7 @@ open class _ObjectPrxI: ObjectPrx {
     }
 
     public func ice_write(to os: OutputStream) {
-        _handle.iceWrite(os)
+        _handle.iceWrite(os, encodingMajor: os.encoding.major, encodingMinor: os.encoding.minor)
     }
 
     public func ice_toString() -> String {
diff --git a/swift/src/IceObjc/IceObjcObjectPrx.h b/swift/src/IceObjc/IceObjcObjectPrx.h
index 67c7ca0fcf8..822baee9da6 100644
--- a/swift/src/IceObjc/IceObjcObjectPrx.h
+++ b/swift/src/IceObjc/IceObjcObjectPrx.h
@@ -90,7 +90,9 @@ NS_ASSUME_NONNULL_BEGIN
              bytesRead:(NSInteger*)bytesRead
                  error:(NSError* _Nullable * _Nullable)error;
 
--(void) iceWrite:(id<ICEOutputStreamHelper>)os;
+-(void) iceWrite:(id<ICEOutputStreamHelper>)os
+   encodingMajor:(uint8_t)encodingMajor
+   encodingMinor:(uint8_t)encodingMinor;
 
 -(nullable ICEInputStream*) iceInvoke:(NSString* _Nonnull)op
                                  mode:(uint8_t)mode
diff --git a/swift/src/IceObjc/ObjectPrx.mm b/swift/src/IceObjc/ObjectPrx.mm
index 868537c0027..f9789a11a52 100644
--- a/swift/src/IceObjc/ObjectPrx.mm
+++ b/swift/src/IceObjc/ObjectPrx.mm
@@ -564,12 +564,14 @@ encodingMinor:(uint8_t)minor
 }
 
 -(void) iceWrite:(id<ICEOutputStreamHelper>)os
+   encodingMajor:(uint8_t)encodingMajor
+   encodingMinor:(uint8_t)encodingMinor
 {
     //
     // Marshal a proxy into a stream and return the encoded bytes.
     //
     auto communicator = _prx->ice_getCommunicator();
-    auto encoding = _prx->ice_getEncodingVersion();
+    Ice::EncodingVersion encoding { encodingMajor, encodingMinor };
     Ice::OutputStream out(communicator, encoding);
     out.write(_prx);
     std::pair<const Ice::Byte*, const Ice::Byte*> p = out.finished();