diff options
Diffstat (limited to 'cs/src/Ice/ServantManager.cs')
-rwxr-xr-x | cs/src/Ice/ServantManager.cs | 352 |
1 files changed, 176 insertions, 176 deletions
diff --git a/cs/src/Ice/ServantManager.cs b/cs/src/Ice/ServantManager.cs index 266f153894c..510883593f4 100755 --- a/cs/src/Ice/ServantManager.cs +++ b/cs/src/Ice/ServantManager.cs @@ -17,22 +17,22 @@ public sealed class ServantManager { public void addServant(Ice.Object servant, Ice.Identity ident, string facet) { - lock(this) - { - Debug.Assert(instance_ != null); // Must not be called after destruction. - - if(facet == null) - { - facet = ""; - } + lock(this) + { + Debug.Assert(instance_ != null); // Must not be called after destruction. + + if(facet == null) + { + facet = ""; + } - Ice.FacetMap m = (Ice.FacetMap)_servantMapMap[ident]; - if(m == null) - { - _servantMapMap[ident] = (m = new Ice.FacetMap()); - } - else - { + Ice.FacetMap m = (Ice.FacetMap)_servantMapMap[ident]; + if(m == null) + { + _servantMapMap[ident] = (m = new Ice.FacetMap()); + } + else + { if(m.Contains(facet)) { Ice.AlreadyRegisteredException ex = new Ice.AlreadyRegisteredException(); @@ -44,171 +44,171 @@ public sealed class ServantManager } throw ex; } - } - - m[facet] = servant; - } + } + + m[facet] = servant; + } } public Ice.Object removeServant(Ice.Identity ident, string facet) { - lock(this) - { - Debug.Assert(instance_ != null); // Must not be called after destruction. - - if(facet == null) - { - facet = ""; - } + lock(this) + { + Debug.Assert(instance_ != null); // Must not be called after destruction. + + if(facet == null) + { + facet = ""; + } - Ice.FacetMap m = (Ice.FacetMap)_servantMapMap[ident]; - Ice.Object obj = null; - if(m == null || !m.Contains(facet)) - { - Ice.NotRegisteredException ex = new Ice.NotRegisteredException(); - ex.id = Ice.Util.identityToString(ident); - ex.kindOfObject = "servant"; - if(facet.Length > 0) - { - ex.id += " -f " + IceUtil.StringUtil.escapeString(facet, ""); - } - throw ex; - } - obj = m[facet]; - m.Remove(facet); - - if(m.Count == 0) - { - _servantMapMap.Remove(ident); - } - return obj; - } + Ice.FacetMap m = (Ice.FacetMap)_servantMapMap[ident]; + Ice.Object obj = null; + if(m == null || !m.Contains(facet)) + { + Ice.NotRegisteredException ex = new Ice.NotRegisteredException(); + ex.id = Ice.Util.identityToString(ident); + ex.kindOfObject = "servant"; + if(facet.Length > 0) + { + ex.id += " -f " + IceUtil.StringUtil.escapeString(facet, ""); + } + throw ex; + } + obj = m[facet]; + m.Remove(facet); + + if(m.Count == 0) + { + _servantMapMap.Remove(ident); + } + return obj; + } } public Ice.FacetMap removeAllFacets(Ice.Identity ident) { lock(this) - { - Debug.Assert(instance_ != null); + { + Debug.Assert(instance_ != null); - Ice.FacetMap m = (Ice.FacetMap)_servantMapMap[ident]; - if(m == null) - { - Ice.NotRegisteredException ex = new Ice.NotRegisteredException(); - ex.id = Ice.Util.identityToString(ident); - ex.kindOfObject = "servant"; - throw ex; - } - _servantMapMap.Remove(ident); + Ice.FacetMap m = (Ice.FacetMap)_servantMapMap[ident]; + if(m == null) + { + Ice.NotRegisteredException ex = new Ice.NotRegisteredException(); + ex.id = Ice.Util.identityToString(ident); + ex.kindOfObject = "servant"; + throw ex; + } + _servantMapMap.Remove(ident); - return m; - } + return m; + } } public Ice.Object findServant(Ice.Identity ident, string facet) { - lock(this) - { - // - // This assert is not valid if the adapter dispatch incoming - // requests from bidir connections. This method might be called if - // requests are received over the bidir connection after the - // adapter was deactivated. - // - //Debug.Assert(instance_ != null); // Must not be called after destruction. - - if(facet == null) - { - facet = ""; - } + lock(this) + { + // + // This assert is not valid if the adapter dispatch incoming + // requests from bidir connections. This method might be called if + // requests are received over the bidir connection after the + // adapter was deactivated. + // + //Debug.Assert(instance_ != null); // Must not be called after destruction. + + if(facet == null) + { + facet = ""; + } - Ice.FacetMap m = (Ice.FacetMap)_servantMapMap[ident]; - Ice.Object obj = null; - if(m != null) - { - obj = m[facet]; - } + Ice.FacetMap m = (Ice.FacetMap)_servantMapMap[ident]; + Ice.Object obj = null; + if(m != null) + { + obj = m[facet]; + } - return obj; - } + return obj; + } } public Ice.FacetMap findAllFacets(Ice.Identity ident) { lock(this) - { - Debug.Assert(instance_ != null); // Must not be called after destruction. + { + Debug.Assert(instance_ != null); // Must not be called after destruction. - Ice.FacetMap m = (Ice.FacetMap)_servantMapMap[ident]; - if(m != null) - { - return (Ice.FacetMap)m.Clone(); - } + Ice.FacetMap m = (Ice.FacetMap)_servantMapMap[ident]; + if(m != null) + { + return (Ice.FacetMap)m.Clone(); + } - return new Ice.FacetMap(); - } + return new Ice.FacetMap(); + } } public bool hasServant(Ice.Identity ident) { lock(this) - { - // - // This assert is not valid if the adapter dispatch incoming - // requests from bidir connections. This method might be called if - // requests are received over the bidir connection after the - // adapter was deactivated. - // - // - //Debug.Assert(instance_ != null); // Must not be called after destruction. + { + // + // This assert is not valid if the adapter dispatch incoming + // requests from bidir connections. This method might be called if + // requests are received over the bidir connection after the + // adapter was deactivated. + // + // + //Debug.Assert(instance_ != null); // Must not be called after destruction. - Ice.FacetMap m = (Ice.FacetMap)_servantMapMap[ident]; - if(m == null) - { - return false; - } - else - { - Debug.Assert(m.Count != 0); - return true; - } - } + Ice.FacetMap m = (Ice.FacetMap)_servantMapMap[ident]; + if(m == null) + { + return false; + } + else + { + Debug.Assert(m.Count != 0); + return true; + } + } } public void addServantLocator(Ice.ServantLocator locator, string category) { - lock(this) - { - Debug.Assert(instance_ != null); // Must not be called after destruction. - - Ice.ServantLocator l = (Ice.ServantLocator)_locatorMap[category]; - if(l != null) - { - Ice.AlreadyRegisteredException ex = new Ice.AlreadyRegisteredException(); - ex.id = IceUtil.StringUtil.escapeString(category, ""); - ex.kindOfObject = "servant locator"; - throw ex; - } - - _locatorMap[category] = locator; - } + lock(this) + { + Debug.Assert(instance_ != null); // Must not be called after destruction. + + Ice.ServantLocator l = (Ice.ServantLocator)_locatorMap[category]; + if(l != null) + { + Ice.AlreadyRegisteredException ex = new Ice.AlreadyRegisteredException(); + ex.id = IceUtil.StringUtil.escapeString(category, ""); + ex.kindOfObject = "servant locator"; + throw ex; + } + + _locatorMap[category] = locator; + } } public Ice.ServantLocator findServantLocator(string category) { - lock(this) - { - // - // This assert is not valid if the adapter dispatch incoming - // requests from bidir connections. This method might be called if - // requests are received over the bidir connection after the - // adapter was deactivated. - // - // - //Debug.Assert(instance_ != null); // Must not be called after destruction. - - return (Ice.ServantLocator)_locatorMap[category]; - } + lock(this) + { + // + // This assert is not valid if the adapter dispatch incoming + // requests from bidir connections. This method might be called if + // requests are received over the bidir connection after the + // adapter was deactivated. + // + // + //Debug.Assert(instance_ != null); // Must not be called after destruction. + + return (Ice.ServantLocator)_locatorMap[category]; + } } // @@ -216,22 +216,22 @@ public sealed class ServantManager // public ServantManager(Instance instance, string adapterName) { - instance_ = instance; - _adapterName = adapterName; + instance_ = instance; + _adapterName = adapterName; } /* ~ServantManager() { - // - // Don't check whether destroy() has been called. It might have - // not been called if the associated object adapter was not - // properly deactivated. - // - //lock(this) - //{ - //IceUtil.Assert.FinalizerAssert(instance_ == null); - //} + // + // Don't check whether destroy() has been called. It might have + // not been called if the associated object adapter was not + // properly deactivated. + // + //lock(this) + //{ + //IceUtil.Assert.FinalizerAssert(instance_ == null); + //} } */ @@ -240,31 +240,31 @@ public sealed class ServantManager // public void destroy() { - lock(this) - { - Debug.Assert(instance_ != null); // Must not be called after destruction. - - _servantMapMap.Clear(); - - foreach(DictionaryEntry p in _locatorMap) - { - Ice.ServantLocator locator = (Ice.ServantLocator)p.Value; - try - { - locator.deactivate((string)p.Key); - } - catch(System.Exception ex) - { - string s = "exception during locator deactivation:\n" + "object adapter: `" - + _adapterName + "'\n" + "locator category: `" + p.Key + "'\n" + ex; - instance_.initializationData().logger.error(s); - } - } - - _locatorMap.Clear(); + lock(this) + { + Debug.Assert(instance_ != null); // Must not be called after destruction. + + _servantMapMap.Clear(); + + foreach(DictionaryEntry p in _locatorMap) + { + Ice.ServantLocator locator = (Ice.ServantLocator)p.Value; + try + { + locator.deactivate((string)p.Key); + } + catch(System.Exception ex) + { + string s = "exception during locator deactivation:\n" + "object adapter: `" + + _adapterName + "'\n" + "locator category: `" + p.Key + "'\n" + ex; + instance_.initializationData().logger.error(s); + } + } + + _locatorMap.Clear(); - instance_ = null; - } + instance_ = null; + } } private Instance instance_; |