summaryrefslogtreecommitdiff
path: root/csharp/src/Ice/ObjectAdapterI.cs
diff options
context:
space:
mode:
Diffstat (limited to 'csharp/src/Ice/ObjectAdapterI.cs')
-rw-r--r--csharp/src/Ice/ObjectAdapterI.cs67
1 files changed, 33 insertions, 34 deletions
diff --git a/csharp/src/Ice/ObjectAdapterI.cs b/csharp/src/Ice/ObjectAdapterI.cs
index da1cb5df9ea..26523708c67 100644
--- a/csharp/src/Ice/ObjectAdapterI.cs
+++ b/csharp/src/Ice/ObjectAdapterI.cs
@@ -10,7 +10,6 @@
namespace Ice
{
using System;
- using System.Collections;
using System.Collections.Generic;
using System.Diagnostics;
using System.Text;
@@ -73,11 +72,11 @@ namespace Ice
try
{
- Ice.Identity dummy = new Ice.Identity();
+ Identity dummy = new Identity();
dummy.name = "dummy";
updateLocatorRegistry(locatorInfo, createDirectProxy(dummy));
}
- catch(Ice.LocalException)
+ catch(LocalException)
{
//
// If we couldn't update the locator registry, we let the
@@ -183,7 +182,7 @@ namespace Ice
{
updateLocatorRegistry(_locatorInfo, null);
}
- catch(Ice.LocalException)
+ catch(LocalException)
{
//
// We can't throw exceptions in deactivate so we ignore
@@ -327,12 +326,12 @@ namespace Ice
}
}
- public ObjectPrx add(Ice.Object obj, Identity ident)
+ public ObjectPrx add(Object obj, Identity ident)
{
return addFacet(obj, ident, "");
}
- public ObjectPrx addFacet(Ice.Object obj, Identity ident, string facet)
+ public ObjectPrx addFacet(Object obj, Identity ident, string facet)
{
lock(this)
{
@@ -354,12 +353,12 @@ namespace Ice
}
}
- public ObjectPrx addWithUUID(Ice.Object obj)
+ public ObjectPrx addWithUUID(Object obj)
{
return addFacetWithUUID(obj, "");
}
- public ObjectPrx addFacetWithUUID(Ice.Object obj, string facet)
+ public ObjectPrx addFacetWithUUID(Object obj, string facet)
{
Identity ident = new Identity();
ident.category = "";
@@ -380,12 +379,12 @@ namespace Ice
}
}
- public Ice.Object remove(Identity ident)
+ public Object remove(Identity ident)
{
return removeFacet(ident, "");
}
- public Ice.Object removeFacet(Identity ident, string facet)
+ public Object removeFacet(Identity ident, string facet)
{
lock(this)
{
@@ -396,7 +395,7 @@ namespace Ice
}
}
- public Dictionary<string, Ice.Object> removeAllFacets(Identity ident)
+ public Dictionary<string, Object> removeAllFacets(Identity ident)
{
lock(this)
{
@@ -407,7 +406,7 @@ namespace Ice
}
}
- public Ice.Object removeDefaultServant(string category)
+ public Object removeDefaultServant(string category)
{
lock(this)
{
@@ -417,12 +416,12 @@ namespace Ice
}
}
- public Ice.Object find(Identity ident)
+ public Object find(Identity ident)
{
return findFacet(ident, "");
}
- public Ice.Object findFacet(Identity ident, string facet)
+ public Object findFacet(Identity ident, string facet)
{
lock(this)
{
@@ -433,7 +432,7 @@ namespace Ice
}
}
- public Dictionary<string, Ice.Object> findAllFacets(Identity ident)
+ public Dictionary<string, Object> findAllFacets(Identity ident)
{
lock(this)
{
@@ -444,7 +443,7 @@ namespace Ice
}
}
- public Ice.Object findByProxy(ObjectPrx proxy)
+ public Object findByProxy(ObjectPrx proxy)
{
lock(this)
{
@@ -455,7 +454,7 @@ namespace Ice
}
}
- public Ice.Object findDefaultServant(string category)
+ public Object findDefaultServant(string category)
{
lock(this)
{
@@ -572,11 +571,11 @@ namespace Ice
try
{
- Ice.Identity dummy = new Ice.Identity();
+ Identity dummy = new Identity();
dummy.name = "dummy";
updateLocatorRegistry(locatorInfo, createDirectProxy(dummy));
}
- catch(Ice.LocalException)
+ catch(LocalException)
{
lock(this)
{
@@ -924,9 +923,9 @@ namespace Ice
//
if(_routerInfo.getAdapter() != null)
{
- Ice.AlreadyRegisteredException ex = new Ice.AlreadyRegisteredException();
+ AlreadyRegisteredException ex = new AlreadyRegisteredException();
ex.kindOfObject = "object adapter with router";
- ex.id = Ice.Util.identityToString(router.ice_getIdentity(), _instance.toStringMode());
+ ex.id = Util.identityToString(router.ice_getIdentity(), _instance.toStringMode());
throw ex;
}
@@ -1098,7 +1097,7 @@ namespace Ice
}
}
- private static void checkServant(Ice.Object servant)
+ private static void checkServant(Object servant)
{
if(servant == null)
{
@@ -1125,7 +1124,7 @@ namespace Ice
end = beg;
while(true)
{
- end = endpts.IndexOf((System.Char) ':', end);
+ end = endpts.IndexOf(':', end);
if(end == -1)
{
end = endpts.Length;
@@ -1137,14 +1136,14 @@ namespace Ice
int quote = beg;
while(true)
{
- quote = endpts.IndexOf((System.Char) '\"', quote);
+ quote = endpts.IndexOf('\"', quote);
if(quote == -1 || end < quote)
{
break;
}
else
{
- quote = endpts.IndexOf((System.Char) '\"', ++quote);
+ quote = endpts.IndexOf('\"', ++quote);
if(quote == -1)
{
break;
@@ -1175,7 +1174,7 @@ namespace Ice
EndpointI endp = _instance.endpointFactoryManager().create(s, oaEndpoints);
if(endp == null)
{
- Ice.EndpointParseException e2 = new Ice.EndpointParseException();
+ EndpointParseException e2 = new EndpointParseException();
e2.str = "invalid object adapter endpoint `" + s + "'";
throw e2;
}
@@ -1260,7 +1259,7 @@ namespace Ice
{
if(_instance.traceLevels().location >= 1)
{
- System.Text.StringBuilder s = new System.Text.StringBuilder();
+ StringBuilder s = new StringBuilder();
s.Append("couldn't update object adapter `" + _id + "' endpoints with the locator registry:\n");
s.Append("the object adapter is not known to the locator registry");
_instance.initializationData().logger.trace(_instance.traceLevels().locationCat, s.ToString());
@@ -1275,7 +1274,7 @@ namespace Ice
{
if(_instance.traceLevels().location >= 1)
{
- System.Text.StringBuilder s = new System.Text.StringBuilder();
+ StringBuilder s = new StringBuilder();
s.Append("couldn't update object adapter `" + _id + "' endpoints with the locator registry:\n");
s.Append("the replica group `" + _replicaGroupId + "' is not known to the locator registry");
_instance.initializationData().logger.trace(_instance.traceLevels().locationCat, s.ToString());
@@ -1290,7 +1289,7 @@ namespace Ice
{
if(_instance.traceLevels().location >= 1)
{
- System.Text.StringBuilder s = new System.Text.StringBuilder();
+ StringBuilder s = new StringBuilder();
s.Append("couldn't update object adapter `" + _id + "' endpoints with the locator registry:\n");
s.Append("the object adapter endpoints are already set");
_instance.initializationData().logger.trace(_instance.traceLevels().locationCat, s.ToString());
@@ -1312,7 +1311,7 @@ namespace Ice
{
if(_instance.traceLevels().location >= 1)
{
- System.Text.StringBuilder s = new System.Text.StringBuilder();
+ StringBuilder s = new StringBuilder();
s.Append("couldn't update object adapter `" + _id + "' endpoints with the locator registry:\n");
s.Append(e.ToString());
_instance.initializationData().logger.trace(_instance.traceLevels().locationCat, s.ToString());
@@ -1322,12 +1321,12 @@ namespace Ice
if(_instance.traceLevels().location >= 1)
{
- System.Text.StringBuilder s = new System.Text.StringBuilder();
+ StringBuilder s = new StringBuilder();
s.Append("updated object adapter `" + _id + "' endpoints with the locator registry\n");
s.Append("endpoints = ");
if(proxy != null)
{
- Ice.Endpoint[] endpoints = proxy.ice_getEndpoints();
+ Endpoint[] endpoints = proxy.ice_getEndpoints();
for(int i = 0; i < endpoints.Length; i++)
{
s.Append(endpoints[i].ToString());
@@ -1388,7 +1387,7 @@ namespace Ice
// Do not create unknown properties list if Ice prefix, ie Ice, Glacier2, etc
//
bool addUnknown = true;
- String prefix = _name + ".";
+ string prefix = _name + ".";
for(int i = 0; PropertyNames.clPropNames[i] != null; ++i)
{
if(prefix.StartsWith(PropertyNames.clPropNames[i] + ".", StringComparison.Ordinal))
@@ -1401,7 +1400,7 @@ namespace Ice
bool noProps = true;
Dictionary<string, string> props =
_instance.initializationData().properties.getPropertiesForPrefix(prefix);
- foreach(String prop in props.Keys)
+ foreach(string prop in props.Keys)
{
bool valid = false;
for(int i = 0; i < _suffixes.Length; ++i)
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 18:27:08 +0000