Fixed bug 2306

5 files changed, 29 insertions, 3 deletions

diff --git a/cpp/CHANGES b/cpp/CHANGES
index 0940c49d89f..6ac8d5ad362 100644
--- a/cpp/CHANGES
+++ b/cpp/CHANGES
@@ -1,6 +1,16 @@
 Changes since version 3.2.X (binary incompatible)
 -------------------------------------------------
 
+- Glacier2 filters are now disabled by default for IceGrid client
+  and administrative sessions created with the IceGrid session 
+  managers. If you rely on these filters to be set, you now need
+  to explicitly set the `IceGrid.Registry.SessionFilters' or
+  `IceGrid.Registry.AdminSessionFilters' property to 1.
+
+- Added IceGrid registry `IceGrid.Registry.AdminSessionManager' 
+  object adapter for Glacier2 administrative sessions. See the
+  manual for more information.
+
 - The marshaling code now throws an exception if an enumerator
   that is out of range for its enumeration is sent or received.
 
diff --git a/cpp/demo/IceGrid/simple/config.grid b/cpp/demo/IceGrid/simple/config.grid
index 6938512443a..9b915423d00 100644
--- a/cpp/demo/IceGrid/simple/config.grid
+++ b/cpp/demo/IceGrid/simple/config.grid
@@ -11,7 +11,6 @@ Ice.Default.Locator=DemoIceGrid/Locator:default -p 4061
 IceGrid.Registry.Client.Endpoints=default -p 4061
 IceGrid.Registry.Server.Endpoints=default
 IceGrid.Registry.Internal.Endpoints=default
-IceGrid.Registry.AdminSessionManager.Endpoints=default
 IceGrid.Registry.Data=db/registry
 IceGrid.Registry.PermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
 IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
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;
     }
 }