diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-10-12 11:34:53 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-10-12 11:34:53 +0200 |
| commit | 23c1e3b603a9d902593ffe9f99562fcda3af1589 (patch) | |
| tree | 60ea7cdc0da5a9676ca12350ac82b069cc86eb5e /java/src/IceBox | |
| parent | .NET demo project updates (diff) | |
| download | ice-23c1e3b603a9d902593ffe9f99562fcda3af1589.tar.bz2 ice-23c1e3b603a9d902593ffe9f99562fcda3af1589.tar.xz ice-23c1e3b603a9d902593ffe9f99562fcda3af1589.zip | |
Added support for Glacier2 MX and fixed ICE-4880
Diffstat (limited to 'java/src/IceBox')
| -rw-r--r-- | java/src/IceBox/ServiceManagerI.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/java/src/IceBox/ServiceManagerI.java b/java/src/IceBox/ServiceManagerI.java index 9d7b830bbb6..2676c5f389b 100644 --- a/java/src/IceBox/ServiceManagerI.java +++ b/java/src/IceBox/ServiceManagerI.java @@ -354,10 +354,10 @@ public class ServiceManagerI extends _ServiceManagerDisp // shared communicator. // IceInternal.MetricsAdminI metricsAdmin = null; - if(_communicator.getObserver() instanceof IceMX.CommunicatorObserverI) + if(_communicator.getObserver() instanceof IceInternal.CommunicatorObserverI) { metricsAdmin = new IceInternal.MetricsAdminI(initData.properties, Ice.Util.getProcessLogger()); - initData.observer = new IceMX.CommunicatorObserverI(metricsAdmin); + initData.observer = new IceInternal.CommunicatorObserverI(metricsAdmin); } _sharedCommunicator = Ice.Util.initialize(initData); @@ -565,9 +565,9 @@ public class ServiceManagerI extends _ServiceManagerDisp { assert(_sharedCommunicator != null); communicator = _sharedCommunicator; - if(communicator.getObserver() instanceof IceMX.CommunicatorObserverI) + if(communicator.getObserver() instanceof IceInternal.CommunicatorObserverI) { - IceMX.CommunicatorObserverI o = (IceMX.CommunicatorObserverI)communicator.getObserver(); + IceInternal.CommunicatorObserverI o = (IceInternal.CommunicatorObserverI)communicator.getObserver(); metricsAdmin = o.getMetricsAdmin(); } } @@ -606,10 +606,10 @@ public class ServiceManagerI extends _ServiceManagerDisp // If Ice metrics are enabled on the IceBox communicator, we also enable them on // the service communicator. // - if(_communicator.getObserver() instanceof IceMX.CommunicatorObserverI) + if(_communicator.getObserver() instanceof IceInternal.CommunicatorObserverI) { metricsAdmin = new IceInternal.MetricsAdminI(initData.properties, initData.logger); - initData.observer = new IceMX.CommunicatorObserverI(metricsAdmin); + initData.observer = new IceInternal.CommunicatorObserverI(metricsAdmin); } // |