diff options
Diffstat (limited to 'cpp/src')
| -rwxr-xr-x | cpp/src/Glacier2/FilterManager.cpp | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/cpp/src/Glacier2/FilterManager.cpp b/cpp/src/Glacier2/FilterManager.cpp index 0ed86eab96a..af9cc832788 100755 --- a/cpp/src/Glacier2/FilterManager.cpp +++ b/cpp/src/Glacier2/FilterManager.cpp @@ -236,15 +236,15 @@ Glacier2::FilterManager::create(const CommunicatorPtr& communicator, const Objec // DEPRECATED PROPERTY: Glacier2.AllowCategories is to be deprecated // and superseded by Glacier2.Filter.Category.Accept. // - string allow = props->getProperty("Glacier2.AllowCategories"); - if(!allow.empty()) + string allow = props->getProperty("Glacier2.Filter.Category.Accept"); + if(allow.empty()) { - communicator->getLogger()->warning( + allow = props->getProperty("Glacier2.AllowCategories"); + if(!allow.empty()) + { + communicator->getLogger()->warning( "Glacier2.AllowCategories has been deprecated, use Glacier2.Filter.Category.Accept instead."); - } - else - { - allow = props->getProperty("Glacier2.Filter.Category.Accept"); + } } vector<string> allowSeq; @@ -257,15 +257,19 @@ Glacier2::FilterManager::create(const CommunicatorPtr& communicator, const Objec // and superseded by Glacier2.Filter.Category.AcceptUser. // int addUserMode; - if(!props->getProperty("Glacier2.AddUserToAllowCategories").empty()) + if(!props->getProperty("Glacier2.Filter.Category.AcceptUser").empty()) { - communicator->getLogger()->warning( - "Glacier2.AddUserToAllowCategories has been deprecated, use Glacier2.Filter.Category.AcceptUser instead."); - addUserMode = props->getPropertyAsInt("Glacier2.AddUserToAllowCategories"); + addUserMode = props->getPropertyAsInt("Glacier2.Filter.Category.AcceptUser"); } else { - addUserMode = props->getPropertyAsInt("Glacier2.Filter.Category.AcceptUser"); + if(!props->getProperty("Glacier2.AddUserToAllowCategories").empty()) + { + communicator->getLogger()->warning( + "Glacier2.AddUserToAllowCategories has been deprecated, \ + use Glacier2.Filter.Category.AcceptUser instead."); + } + addUserMode = props->getPropertyAsInt("Glacier2.AddUserToAllowCategories"); } if(addUserMode > 0 && !userId.empty()) |