diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-08-10 10:34:15 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-08-10 10:34:15 +0200 |
| commit | 6eeb4166509fe7eff1a482737fa6d695ae991705 (patch) | |
| tree | 807e1a7c18addadcca79cca2f2229f5a0de9c49e /cpp/src | |
| parent | Merge remote-tracking branch 'origin/encoding11' into mx (diff) | |
| download | ice-6eeb4166509fe7eff1a482737fa6d695ae991705.tar.bz2 ice-6eeb4166509fe7eff1a482737fa6d695ae991705.tar.xz ice-6eeb4166509fe7eff1a482737fa6d695ae991705.zip | |
Config bug fix
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/MetricsAdminI.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/Ice/PropertyNames.cpp | 13 | ||||
| -rw-r--r-- | cpp/src/Ice/PropertyNames.h | 3 |
3 files changed, 10 insertions, 8 deletions
diff --git a/cpp/src/Ice/MetricsAdminI.cpp b/cpp/src/Ice/MetricsAdminI.cpp index 16bc951e648..8000dd429e4 100644 --- a/cpp/src/Ice/MetricsAdminI.cpp +++ b/cpp/src/Ice/MetricsAdminI.cpp @@ -308,7 +308,7 @@ MetricsAdminI::addFactory(const string& mapName, const MetricsMapFactoryPtr& fac if(q == _views.end()) { bool disabled = _properties->getPropertyAsIntWithDefault(viewsPrefix + viewName + ".Disabled", 0) > 0; - q = _views.insert(make_pair(viewName, new MetricsViewI(disabled))).first; + q = _views.insert(make_pair(viewName, new MetricsViewI(!disabled))).first; } MetricsViewIPtr view = q->second; diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp index d49ae345fcd..b1de65c529d 100644 --- a/cpp/src/Ice/PropertyNames.cpp +++ b/cpp/src/Ice/PropertyNames.cpp @@ -8,7 +8,7 @@ // ********************************************************************** // -// Generated by makeprops.py from file ../config/PropertyNames.xml, Wed Jul 25 08:55:03 2012 +// Generated by makeprops.py from file ./config/PropertyNames.xml, Fri Aug 10 10:27:32 2012 // IMPORTANT: Do not edit this file -- any edits made here will be lost! @@ -167,11 +167,12 @@ const IceInternal::PropertyArray const IceInternal::Property IceMXPropsData[] = { - IceInternal::Property("IceMX.MetricsView.*.GroupBy", false, 0), - IceInternal::Property("IceMX.MetricsView.*.Reaper", false, 0), - IceInternal::Property("IceMX.MetricsView.*.Accept", false, 0), - IceInternal::Property("IceMX.MetricsView.*.Reject", false, 0), - IceInternal::Property("IceMX.MetricsView.*", false, 0), + IceInternal::Property("IceMX.Metrics.*.GroupBy", false, 0), + IceInternal::Property("IceMX.Metrics.*.Map", false, 0), + IceInternal::Property("IceMX.Metrics.*.RetainDetached", false, 0), + IceInternal::Property("IceMX.Metrics.*.Accept", false, 0), + IceInternal::Property("IceMX.Metrics.*.Reject", false, 0), + IceInternal::Property("IceMX.Metrics.*", false, 0), }; const IceInternal::PropertyArray diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h index a99b1997a0a..ce4a7927dcb 100644 --- a/cpp/src/Ice/PropertyNames.h +++ b/cpp/src/Ice/PropertyNames.h @@ -8,7 +8,7 @@ // ********************************************************************** // -// Generated by makeprops.py from file ../config/PropertyNames.xml, Wed Jul 25 08:55:03 2012 +// Generated by makeprops.py from file ./config/PropertyNames.xml, Fri Aug 10 10:27:32 2012 // IMPORTANT: Do not edit this file -- any edits made here will be lost! @@ -75,3 +75,4 @@ public: }; } + |