Initial merge for ICE-2400:

- added new Logger admin facet (C++ only)
- this Logger facet allows remote application to retrieve the Ice log file, including recently logged events, with optional filters
- this logger facet also allows remote applications to attach RemoteLogger objects to get new logs as they are generated
- added new "show log" feature to icegridadmin, to retrieve Ice log file of Ice server (not yet implemented for IceGrid registry and node)

1 files changed, 2 insertions, 2 deletions

diff --git a/cpp/src/Ice/ProtocolInstance.h b/cpp/src/Ice/ProtocolInstance.h
index 9a0ebec59b9..60ce51426f2 100644
--- a/cpp/src/Ice/ProtocolInstance.h
+++ b/cpp/src/Ice/ProtocolInstance.h
@@ -18,6 +18,7 @@
 #include <Ice/ConnectorF.h>
 #include <Ice/IPEndpointIF.h>
 #include <Ice/NetworkF.h>
+#include <Ice/Instance.h>
 
 namespace IceInternal
 {
@@ -40,7 +41,7 @@ public:
 
     const Ice::LoggerPtr& logger() const
     {
-        return _logger;
+        return _instance->initializationData().logger;
     }
 
     const std::string& protocol() const
@@ -81,7 +82,6 @@ protected:
 
     const int _traceLevel;
     const std::string _traceCategory;
-    const Ice::LoggerPtr _logger;
     const Ice::PropertiesPtr _properties;
     const std::string _protocol;
     const Ice::Short _type;