summaryrefslogtreecommitdiff
path: root/java/src/IceInternal/ObserverHelper.java
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2014-09-12 13:24:38 +0200
committerBenoit Foucher <benoit@zeroc.com>2014-09-12 13:24:38 +0200
commitabeebf67ba35156606bbaabf073b496900f836cf (patch)
tree430212c34a1a1d4922fa11426e9fbd537fb98e52 /java/src/IceInternal/ObserverHelper.java
parentFixed dependencies (diff)
downloadice-abeebf67ba35156606bbaabf073b496900f836cf.tar.bz2
ice-abeebf67ba35156606bbaabf073b496900f836cf.tar.xz
ice-abeebf67ba35156606bbaabf073b496900f836cf.zip
Fixed ICE-5620: metrics admin creation in IceBox, fixed bug where timer wasn't instrumented
Diffstat (limited to 'java/src/IceInternal/ObserverHelper.java')
-rw-r--r--java/src/IceInternal/ObserverHelper.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/java/src/IceInternal/ObserverHelper.java b/java/src/IceInternal/ObserverHelper.java
index 9ad83d5a3d7..bb6edb015c1 100644
--- a/java/src/IceInternal/ObserverHelper.java
+++ b/java/src/IceInternal/ObserverHelper.java
@@ -17,7 +17,7 @@ public final class ObserverHelper
static public InvocationObserver
get(Instance instance, String op)
{
- CommunicatorObserver obsv = instance.getObserver();
+ CommunicatorObserver obsv = instance.initializationData().observer;
if(obsv != null)
{
InvocationObserver observer = obsv.getInvocationObserver(null, op, _emptyContext);
@@ -39,7 +39,8 @@ public final class ObserverHelper
static public InvocationObserver
get(Ice.ObjectPrx proxy, String op, java.util.Map<String, String> context)
{
- CommunicatorObserver obsv = ((Ice.ObjectPrxHelperBase)proxy).__reference().getInstance().getObserver();
+ CommunicatorObserver obsv =
+ ((Ice.ObjectPrxHelperBase)proxy).__reference().getInstance().initializationData().observer;
if(obsv != null)
{
InvocationObserver observer;