diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2005-07-28 16:11:09 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2005-07-28 16:11:09 +0000 |
| commit | 352f20b1b7aeb93164164e6c77356dbdcd708cef (patch) | |
| tree | 16391b09de940b4037c6c00568ecb48ccb5d2a78 /cpp/src/IceGrid/Topics.cpp | |
| parent | Fix compiler warnings (diff) | |
| download | ice-352f20b1b7aeb93164164e6c77356dbdcd708cef.tar.bz2 ice-352f20b1b7aeb93164164e6c77356dbdcd708cef.tar.xz ice-352f20b1b7aeb93164164e6c77356dbdcd708cef.zip | |
Lots of descriptor changes.
Diffstat (limited to 'cpp/src/IceGrid/Topics.cpp')
| -rw-r--r-- | cpp/src/IceGrid/Topics.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/cpp/src/IceGrid/Topics.cpp b/cpp/src/IceGrid/Topics.cpp index cc5d10f1c53..621607a53a4 100644 --- a/cpp/src/IceGrid/Topics.cpp +++ b/cpp/src/IceGrid/Topics.cpp @@ -233,7 +233,7 @@ RegistryObserverTopic::init(int serial, const ApplicationDescriptorSeq& apps, co } void -RegistryObserverTopic::applicationAdded(int serial, const ApplicationDescriptorPtr& desc, const Ice::Current&) +RegistryObserverTopic::applicationAdded(int serial, const ApplicationDescriptor& desc, const Ice::Current&) { Lock sync(*this); @@ -252,7 +252,7 @@ RegistryObserverTopic::applicationRemoved(int serial, const string& name, const updateSerial(serial); for(ApplicationDescriptorSeq::iterator p = _applications.begin(); p != _applications.end(); ++p) { - if((*p)->name == name) + if(p->name == name) { _applications.erase(p); break; @@ -268,15 +268,14 @@ RegistryObserverTopic::applicationUpdated(int serial, const ApplicationUpdateDes Lock sync(*this); updateSerial(serial); - ApplicationUpdateDescriptor newDesc; try { for(ApplicationDescriptorSeq::iterator p = _applications.begin(); p != _applications.end(); ++p) { - if((*p)->name == desc.name) + if(p->name == desc.name) { - ApplicationDescriptorHelper helper(c.adapter->getCommunicator(), *p); - newDesc = helper.update(desc); + ApplicationHelper helper(*p); + helper.update(desc); *p = helper.getDescriptor(); break; } @@ -292,7 +291,7 @@ RegistryObserverTopic::applicationUpdated(int serial, const ApplicationUpdateDes assert(false); } - _publisher->applicationUpdated(serial, newDesc); + _publisher->applicationUpdated(serial, desc); } void |