Fixed bug 2306

3 files changed, 19 insertions, 2 deletions

diff --git a/cpp/src/IceGrid/AdminSessionI.cpp b/cpp/src/IceGrid/AdminSessionI.cpp
index a39db20ee4b..df4f2029657 100644
--- a/cpp/src/IceGrid/AdminSessionI.cpp
+++ b/cpp/src/IceGrid/AdminSessionI.cpp
@@ -381,7 +381,7 @@ AdminSessionFactory::AdminSessionFactory(const SessionServantManagerPtr& servant
     if(_servantManager) // Not set if Glacier2 session manager adapter not enabled
     {
         Ice::PropertiesPtr props = database->getCommunicator()->getProperties();
-        const_cast<bool&>(_filters) = props->getPropertyAsIntWithDefault("IceGrid.Registry.AdminSessionFilters", 1) > 0;
+        const_cast<bool&>(_filters) = props->getPropertyAsIntWithDefault("IceGrid.Registry.AdminSessionFilters", 0) > 0;
     }
 }
 
diff --git a/cpp/src/IceGrid/RegistryI.cpp b/cpp/src/IceGrid/RegistryI.cpp
index f7cfd0e4625..9051af23036 100644
--- a/cpp/src/IceGrid/RegistryI.cpp
+++ b/cpp/src/IceGrid/RegistryI.cpp
@@ -190,6 +190,23 @@ RegistryI::start(bool nowarn)
         {
             Warning out(_communicator->getLogger());
             out << "session manager endpoints `IceGrid.Registry.SessionManager.Endpoints' enabled";
+            if(properties->getPropertyAsInt("IceGrid.Registry.SessionFilters") == 0)
+            {
+                out << " (with Glacier2 filters disabled)";
+            }
+        }
+    }
+
+    if(!properties->getProperty("IceGrid.Registry.AdminSessionManager.Endpoints").empty())
+    {
+        if(!nowarn)
+        {
+            Warning out(_communicator->getLogger());
+            out << "administrative session manager endpoints `IceGrid.Registry.AdminSessionManager.Endpoints' enabled";
+            if(properties->getPropertyAsInt("IceGrid.Registry.AdminSessionFilters") == 0)
+            {
+                out << " (with Glacier2 filters disabled)";
+            }
         }
     }
 
diff --git a/cpp/src/IceGrid/SessionI.cpp b/cpp/src/IceGrid/SessionI.cpp
index fd9e827a2f3..0032d29bdfc 100644
--- a/cpp/src/IceGrid/SessionI.cpp
+++ b/cpp/src/IceGrid/SessionI.cpp
@@ -304,7 +304,7 @@ ClientSessionFactory::ClientSessionFactory(const SessionServantManagerPtr& serva
     if(_servantManager) // Not set if Glacier2 session manager adapter not enabled
     {
         Ice::PropertiesPtr properties = _database->getCommunicator()->getProperties();
-        const_cast<bool&>(_filters) = properties->getPropertyAsIntWithDefault("IceGrid.Registry.SessionFilters", 1) > 0;
+        const_cast<bool&>(_filters) = properties->getPropertyAsIntWithDefault("IceGrid.Registry.SessionFilters", 0) > 0;
     }
 }