summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Incoming.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2012-08-09 10:20:56 +0200
committerBenoit Foucher <benoit@zeroc.com>2012-08-09 10:20:56 +0200
commit62f9ccfd51f985db0539d9af7030c0461bb23008 (patch)
treef42692c3240096e7eb400bd698125ceeec11e436 /cpp/src/Ice/Incoming.cpp
parentMerge remote-tracking branch 'origin/encoding11' into mx (diff)
downloadice-62f9ccfd51f985db0539d9af7030c0461bb23008.tar.bz2
ice-62f9ccfd51f985db0539d9af7030c0461bb23008.tar.xz
ice-62f9ccfd51f985db0539d9af7030c0461bb23008.zip
Fix
Diffstat (limited to 'cpp/src/Ice/Incoming.cpp')
-rw-r--r--cpp/src/Ice/Incoming.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/Ice/Incoming.cpp b/cpp/src/Ice/Incoming.cpp
index 9c854ffb8dc..86229643843 100644
--- a/cpp/src/Ice/Incoming.cpp
+++ b/cpp/src/Ice/Incoming.cpp
@@ -582,10 +582,10 @@ IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager, BasicStre
_current.ctx.insert(_current.ctx.end(), pr);
}
- const ObserverResolverPtr& resolver = _is->instance()->initializationData().observerResolver;
- if(resolver)
+ const CommunicatorObserverPtr& obsv = _is->instance()->initializationData().observer;
+ if(obsv)
{
- _observer.attach(resolver->getDispatchObserver(_current));
+ _observer.attach(obsv->getDispatchObserver(_current));
}
//