diff options
| -rwxr-xr-x | cs/src/Ice/CommunicatorI.cs | 11 | ||||
| -rwxr-xr-x | cs/src/Ice/ObjectAdapterI.cs | 23 |
2 files changed, 28 insertions, 6 deletions
diff --git a/cs/src/Ice/CommunicatorI.cs b/cs/src/Ice/CommunicatorI.cs index 573ffa8d712..ab8c2dbc1ab 100755 --- a/cs/src/Ice/CommunicatorI.cs +++ b/cs/src/Ice/CommunicatorI.cs @@ -297,9 +297,16 @@ namespace Ice { lock(this) { - if(!_destroyed && !System.Environment.HasShutdownStarted) + if(!_destroyed) { - _instance.logger().warning("Ice::Communicator::destroy() has not been called"); + if(!System.Environment.HasShutdownStarted) + { + _instance.logger().warning("Ice::Communicator::destroy() has not been called"); + } + else + { + System.Console.Error.WriteLine("Ice::Communicator::destroy() has not been called"); + } } } } diff --git a/cs/src/Ice/ObjectAdapterI.cs b/cs/src/Ice/ObjectAdapterI.cs index 027bdfacefc..b28bbc61061 100755 --- a/cs/src/Ice/ObjectAdapterI.cs +++ b/cs/src/Ice/ObjectAdapterI.cs @@ -767,13 +767,28 @@ namespace Ice { lock(this) { - if(!_deactivated && !Environment.HasShutdownStarted) + if(!_deactivated) { - _instance.logger().warning("object adapter `" + _name + "' has not been deactivated"); + if(!Environment.HasShutdownStarted) + { + _instance.logger().warning("object adapter `" + _name + "' has not been deactivated"); + } + else + { + Console.Error.WriteLine("object adapter `" + _name + "' has not been deactivated"); + } } - else if(_instance != null && !Environment.HasShutdownStarted) + else if(_instance != null) { - _instance.logger().warning("object adapter `" + _name + "' deactivation had not been waited for"); + if(!Environment.HasShutdownStarted) + { + _instance.logger().warning("object adapter `" + _name + + "' deactivation had not been waited for"); + } + else + { + Console.Error.WriteLine("object adapter `" + _name + "' deactivation had not been waited for"); + } } else { |