Fixes for OutputStream and InputStream initialization

1 files changed, 8 insertions, 8 deletions

diff --git a/swift/src/Ice/OutputStream.swift b/swift/src/Ice/OutputStream.swift
index 8dcfd0d9c58..e49901441e0 100644
--- a/swift/src/Ice/OutputStream.swift
+++ b/swift/src/Ice/OutputStream.swift
@@ -19,17 +19,17 @@ public class OutputStream {
     private var encapsStack: Encaps!
     private var encapsCache: Encaps?
 
-    public init(communicator: Communicator, encoding: EncodingVersion = currentEncoding) {
+    public convenience init(communicator: Communicator) {
+        let encoding = (communicator as! CommunicatorI).defaultsAndOverrides.defaultEncoding
+        self.init(communicator: communicator, encoding: encoding)
+    }
+
+    public init(communicator: Communicator, encoding: EncodingVersion) {
         self.communicator = communicator
         self.encoding = encoding
         self.encoding_1_0 = (encoding.major == 1 && encoding.minor == 0)
-        buf = Buffer()
-
-        if communicator.getProperties().getPropertyAsIntWithDefault(key: "Ice.Default.SlicedFormat", value: 0) > 0 {
-            format = FormatType.SlicedFormat
-        } else {
-            format = FormatType.CompactFormat
-        }
+        self.buf = Buffer()
+        self.format = (communicator as! CommunicatorI).defaultsAndOverrides.defaultFormat
     }
 
     public func startEncapsulation() {