summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Instance.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2016-08-16 16:37:18 +0200
committerBenoit Foucher <benoit@zeroc.com>2016-08-16 16:37:18 +0200
commit88293201e566c982830482601e878ff4bc643782 (patch)
treeb0ffc2633b8404cde06d4786927b1f6b63024849 /cpp/src/Ice/Instance.cpp
parentFixed ICE-7273 - C# AMI test failure (diff)
downloadice-88293201e566c982830482601e878ff4bc643782.tar.bz2
ice-88293201e566c982830482601e878ff4bc643782.tar.xz
ice-88293201e566c982830482601e878ff4bc643782.zip
C# mapping changes
- user exceptions are no longer checked on the server side (ICE-6980) - support for ["marshaled-result"] metadata - AMD operations now return a Task - improved dispatch interceptors - PropertiesAdminI::setProperties impl. now invokes callbacks synchronously
Diffstat (limited to 'cpp/src/Ice/Instance.cpp')
-rw-r--r--cpp/src/Ice/Instance.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp
index cf9e6067652..d99567e09f9 100644
--- a/cpp/src/Ice/Instance.cpp
+++ b/cpp/src/Ice/Instance.cpp
@@ -1388,7 +1388,7 @@ IceInternal::Instance::finishSetup(int& argc, char* argv[], const Ice::Communica
PropertiesAdminIPtr propsAdmin;
if(_adminFacetFilter.empty() || _adminFacetFilter.find(propertiesFacetName) != _adminFacetFilter.end())
{
- propsAdmin = ICE_MAKE_SHARED(PropertiesAdminI, _initData.properties, _initData.logger);
+ propsAdmin = ICE_MAKE_SHARED(PropertiesAdminI, this);
_adminFacets.insert(make_pair(propertiesFacetName, propsAdmin));
}