diff options
Diffstat (limited to 'csharp/src')
| -rw-r--r-- | csharp/src/Ice/ACM.cs | 1 | ||||
| -rw-r--r-- | csharp/src/Ice/AsyncResult.cs | 1 | ||||
| -rw-r--r-- | csharp/src/Ice/ConnectionI.cs | 1 | ||||
| -rw-r--r-- | csharp/src/Ice/ImplicitContextI.cs | 3 | ||||
| -rw-r--r-- | csharp/src/Ice/LoggerAdminI.cs | 2 | ||||
| -rw-r--r-- | csharp/src/Ice/Network.cs | 2 | ||||
| -rw-r--r-- | csharp/src/Ice/OpaqueEndpointI.cs | 1 | ||||
| -rw-r--r-- | csharp/src/Ice/PropertiesI.cs | 1 | ||||
| -rw-r--r-- | csharp/src/Ice/Proxy.cs | 2 | ||||
| -rw-r--r-- | csharp/src/Ice/StringUtil.cs | 1 | ||||
| -rw-r--r-- | csharp/src/IceBox/ServiceManagerI.cs | 1 | ||||
| -rw-r--r-- | csharp/src/IceSSL/SSLEngine.cs | 1 |
12 files changed, 0 insertions, 17 deletions
diff --git a/csharp/src/Ice/ACM.cs b/csharp/src/Ice/ACM.cs index cacccfb41c8..6eef3867299 100644 --- a/csharp/src/Ice/ACM.cs +++ b/csharp/src/Ice/ACM.cs @@ -232,7 +232,6 @@ namespace IceInternal } } - // // Monitor connections outside the thread synchronization, so // that connections can be added or removed during monitoring. diff --git a/csharp/src/Ice/AsyncResult.cs b/csharp/src/Ice/AsyncResult.cs index 6e4d4adddfb..12ed39c83d6 100644 --- a/csharp/src/Ice/AsyncResult.cs +++ b/csharp/src/Ice/AsyncResult.cs @@ -435,7 +435,6 @@ namespace IceInternal return check(r, operation); } - public static AsyncResultI check(Ice.AsyncResult r, string operation) { if(r == null) diff --git a/csharp/src/Ice/ConnectionI.cs b/csharp/src/Ice/ConnectionI.cs index d3150ba8321..a191988d800 100644 --- a/csharp/src/Ice/ConnectionI.cs +++ b/csharp/src/Ice/ConnectionI.cs @@ -792,7 +792,6 @@ namespace Ice return; // The request has already been or will be shortly notified of the failure. } - OutgoingMessage o = _sendStreams.FirstOrDefault(m => m.outAsync == outAsync); if(o != null) { diff --git a/csharp/src/Ice/ImplicitContextI.cs b/csharp/src/Ice/ImplicitContextI.cs index 5bd9eccedb8..efd8111530b 100644 --- a/csharp/src/Ice/ImplicitContextI.cs +++ b/csharp/src/Ice/ImplicitContextI.cs @@ -48,7 +48,6 @@ namespace Ice abstract internal Dictionary<string, string> combine(Dictionary<string, string> prxContext); } - internal class SharedImplicitContext : ImplicitContextI { public override Dictionary<string, string> getContext() @@ -105,7 +104,6 @@ namespace Ice } } - public override string put(string key, string value) { lock(this) @@ -329,7 +327,6 @@ namespace Ice } } - string val = null; if(!threadContext.TryGetValue(key, out val)) { diff --git a/csharp/src/Ice/LoggerAdminI.cs b/csharp/src/Ice/LoggerAdminI.cs index 05d3236473b..ef5ecd1fa22 100644 --- a/csharp/src/Ice/LoggerAdminI.cs +++ b/csharp/src/Ice/LoggerAdminI.cs @@ -161,7 +161,6 @@ sealed class LoggerAdminI : Ice.LoggerAdminDisp_ return logMessages.ToArray(); } - internal LoggerAdminI(Ice.Properties props, LoggerAdminLoggerI logger) { _maxLogCount = props.getPropertyAsIntWithDefault("Ice.Admin.Logger.KeepLogs", 100); @@ -431,7 +430,6 @@ sealed class LoggerAdminI : Ice.LoggerAdminDisp_ return Ice.Util.initialize(initData); } - private readonly LinkedList<Ice.LogMessage> _queue = new LinkedList<Ice.LogMessage>(); private int _logCount = 0; // non-trace messages private readonly int _maxLogCount; diff --git a/csharp/src/Ice/Network.cs b/csharp/src/Ice/Network.cs index 08ffc80a77b..59f88fa3e17 100644 --- a/csharp/src/Ice/Network.cs +++ b/csharp/src/Ice/Network.cs @@ -235,7 +235,6 @@ namespace IceInternal throw new Ice.SocketException(ex); } - if(!udp) { try @@ -726,7 +725,6 @@ namespace IceInternal return addresses; } - int retry = 5; repeatGetHostByName: diff --git a/csharp/src/Ice/OpaqueEndpointI.cs b/csharp/src/Ice/OpaqueEndpointI.cs index c52cc9c0185..b31f39a1111 100644 --- a/csharp/src/Ice/OpaqueEndpointI.cs +++ b/csharp/src/Ice/OpaqueEndpointI.cs @@ -383,7 +383,6 @@ namespace IceInternal throw new Ice.EndpointParseException("no argument provided for -v option in endpoint " + endpoint); } - try { _rawBytes = System.Convert.FromBase64String(argument); diff --git a/csharp/src/Ice/PropertiesI.cs b/csharp/src/Ice/PropertiesI.cs index eee1f52925e..6f54ca37a5c 100644 --- a/csharp/src/Ice/PropertiesI.cs +++ b/csharp/src/Ice/PropertiesI.cs @@ -131,7 +131,6 @@ namespace Ice } } - public Dictionary<string, string> getPropertiesForPrefix(string prefix) { lock(this) diff --git a/csharp/src/Ice/Proxy.cs b/csharp/src/Ice/Proxy.cs index 8141471f56d..621ecdde059 100644 --- a/csharp/src/Ice/Proxy.cs +++ b/csharp/src/Ice/Proxy.cs @@ -771,7 +771,6 @@ namespace Ice [EditorBrowsable(EditorBrowsableState.Never)] void iceWrite(OutputStream os); - /// <summary> /// Returns an scheduler object that use the Ice thread pool. /// </summary> @@ -2944,7 +2943,6 @@ namespace Ice return d; } - /// <summary> /// Returns the Slice type id of the interface or class associated /// with this proxy class. diff --git a/csharp/src/Ice/StringUtil.cs b/csharp/src/Ice/StringUtil.cs index 8fc7555dd0c..f8caee47cbb 100644 --- a/csharp/src/Ice/StringUtil.cs +++ b/csharp/src/Ice/StringUtil.cs @@ -301,7 +301,6 @@ namespace IceUtilInternal return c; } - // // Decode the character or escape sequence starting at start and appends it to result; // returns the index of the first character following the decoded character diff --git a/csharp/src/IceBox/ServiceManagerI.cs b/csharp/src/IceBox/ServiceManagerI.cs index 129fdb5a468..e1bb8edc6b2 100644 --- a/csharp/src/IceBox/ServiceManagerI.cs +++ b/csharp/src/IceBox/ServiceManagerI.cs @@ -703,7 +703,6 @@ class ServiceManagerI : ServiceManagerDisp_ throw e; } - try { info.service.start(service, communicator, info.args); diff --git a/csharp/src/IceSSL/SSLEngine.cs b/csharp/src/IceSSL/SSLEngine.cs index 119e5f97b8c..6b9dbbf5242 100644 --- a/csharp/src/IceSSL/SSLEngine.cs +++ b/csharp/src/IceSSL/SSLEngine.cs @@ -480,7 +480,6 @@ namespace IceSSL internal void verifyPeer(string address, IceSSL.ConnectionInfo info, string desc) { - if(_verifyDepthMax > 0 && info.certs != null && info.certs.Length > _verifyDepthMax) { string msg = (info.incoming ? "incoming" : "outgoing") + " connection rejected:\n" + |