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, 6 insertions, 4 deletions

diff --git a/cpp/src/IceGrid/ObjectCache.h b/cpp/src/IceGrid/ObjectCache.h
index 9511bc919a5..35ccc365fd8 100644
--- a/cpp/src/IceGrid/ObjectCache.h
+++ b/cpp/src/IceGrid/ObjectCache.h
@@ -33,15 +33,17 @@ public:
     
     ObjectEntry(Cache<Ice::Identity, ObjectEntry>&, const Ice::Identity&);
 
-    void set(const ObjectInfo&);
+    void set(const std::string&, const ObjectInfo&);
     Ice::ObjectPrx getProxy() const;
-    const ObjectInfo& getObjectInfo() const;
     std::string getType() const;
+    std::string getApplication() const;
+    const ObjectInfo& getObjectInfo() const;
 
     bool canRemove();
     
 private:
-    
+
+    std::string _application;
     ObjectInfo _info;
 };
 typedef IceUtil::Handle<ObjectEntry> ObjectEntryPtr;
@@ -52,7 +54,7 @@ public:
 
     ObjectCache(const Ice::CommunicatorPtr&);
 
-    void add(const std::string&, const std::string&, const ObjectDescriptor&);
+    void add(const std::string&, const std::string&, const std::string&, const ObjectDescriptor&);
     ObjectEntryPtr get(const Ice::Identity&) const;
     ObjectEntryPtr remove(const Ice::Identity&);