Improved the error message if you try to remove an object or adapter with

    the admin interface and if that object or adapter was added with a
    deployment descriptor.
Fixed a bug where trying to start a server managed by a node would fail if
    this server was previously manually activated.
Simplified adapter direct proxy update if the adapter is an adapter that
    wasn't added with a deployment descriptor.
Fixes to allow compilation on AIX.

1 files changed, 10 insertions, 3 deletions

diff --git a/cpp/src/IceGrid/ObjectCache.cpp b/cpp/src/IceGrid/ObjectCache.cpp
index 6d9163db72b..92c1c283149 100644
--- a/cpp/src/IceGrid/ObjectCache.cpp
+++ b/cpp/src/IceGrid/ObjectCache.cpp
@@ -24,7 +24,7 @@ ObjectCache::ObjectCache(const Ice::CommunicatorPtr& communicator) :
 }
 
 void
-ObjectCache::add(const string& adapterId, const string& endpoints, const ObjectDescriptor& desc)
+ObjectCache::add(const string& app, const string& adapterId, const string& endpoints, const ObjectDescriptor& desc)
 {
     Lock sync(*this);
     assert(!getImpl(desc.id));
@@ -41,7 +41,7 @@ ObjectCache::add(const string& adapterId, const string& endpoints, const ObjectD
     {
 	info.proxy = _communicator->stringToProxy(Ice::identityToString(desc.id) + "@" + adapterId);
     }
-    entry->set(info);
+    entry->set(app, info);
 
     map<string, set<Ice::Identity> >::iterator p = _types.find(entry->getType());
     if(p == _types.end())
@@ -133,8 +133,9 @@ ObjectEntry::ObjectEntry(Cache<Ice::Identity, ObjectEntry>&, const Ice::Identity
 }
 
 void
-ObjectEntry::set(const ObjectInfo& info)
+ObjectEntry::set(const string& app, const ObjectInfo& info)
 {
+    _application = app;
     _info = info;
 }
 
@@ -150,6 +151,12 @@ ObjectEntry::getType() const
     return _info.type;
 }
 
+string
+ObjectEntry::getApplication() const
+{
+    return _application;
+}
+
 const ObjectInfo&
 ObjectEntry::getObjectInfo() const
 {