1 files changed, 8 insertions, 8 deletions

diff --git a/swift/src/Ice/ServantManager.swift b/swift/src/Ice/ServantManager.swift
index e66eae1d63d..96c5327efc5 100644
--- a/swift/src/Ice/ServantManager.swift
+++ b/swift/src/Ice/ServantManager.swift
@@ -6,8 +6,8 @@ class ServantManager {
     private let adapterName: String
     private let communicator: Communicator
 
-    private var servantMapMap = [Identity: [String: Object]]()
-    private var defaultServantMap = [String: Object]()
+    private var servantMapMap = [Identity: [String: Disp]]()
+    private var defaultServantMap = [String: Disp]()
     private var locatorMap = [String: ServantLocator]()
 
     // This is used to distingish between ObjectNotExistException and FacetNotExistException
@@ -21,7 +21,7 @@ class ServantManager {
         self.communicator = communicator
     }
 
-    func addServant(servant: Object, id ident: Identity, facet: String) throws {
+    func addServant(servant: Disp, id ident: Identity, facet: String) throws {
         try mutex.sync {
             if var m = servantMapMap[ident] {
                 if m[facet] != nil {
@@ -39,7 +39,7 @@ class ServantManager {
         }
     }
 
-    func addDefaultServant(servant: Object, category: String) throws {
+    func addDefaultServant(servant: Disp, category: String) throws {
         try mutex.sync {
             guard defaultServantMap[category] == nil else {
                 throw AlreadyRegisteredException(kindOfObject: "default servant", id: category)
@@ -49,7 +49,7 @@ class ServantManager {
         }
     }
 
-    func removeServant(id ident: Identity, facet: String) throws -> Object {
+    func removeServant(id ident: Identity, facet: String) throws -> Disp {
         return try mutex.sync {
             guard var m = servantMapMap[ident], let obj = m.removeValue(forKey: facet) else {
                 var id = communicator.identityToString(ident)
@@ -68,7 +68,7 @@ class ServantManager {
         }
     }
 
-    func removeDefaultServant(category: String) throws -> Object {
+    func removeDefaultServant(category: String) throws -> Disp {
         return try mutex.sync {
             guard let obj = defaultServantMap.removeValue(forKey: category) else {
                 throw NotRegisteredException(kindOfObject: "default servant", id: category)
@@ -88,7 +88,7 @@ class ServantManager {
         }
     }
 
-    func findServant(id: Identity, facet: String) -> Object? {
+    func findServant(id: Identity, facet: String) -> Disp? {
         return mutex.sync {
             guard let m = servantMapMap[id] else {
                 guard let obj = defaultServantMap[id.category] else {
@@ -102,7 +102,7 @@ class ServantManager {
         }
     }
 
-    func findDefaultServant(category: String) -> Object? {
+    func findDefaultServant(category: String) -> Disp? {
         return mutex.sync {
             defaultServantMap[category]
         }