1 files changed, 6 insertions, 58 deletions

diff --git a/cpp/src/IceGrid/ObjectCache.h b/cpp/src/IceGrid/ObjectCache.h
index 079bfaf9465..fa2d9c92e93 100644
--- a/cpp/src/IceGrid/ObjectCache.h
+++ b/cpp/src/IceGrid/ObjectCache.h
@@ -11,26 +11,20 @@
 #define ICE_GRID_OBJECTCACHE_H
 
 #include <IceUtil/Mutex.h>
-#include <IceUtil/Shared.h>
 #include <Ice/CommunicatorF.h>
 #include <IceGrid/Cache.h>
 #include <IceGrid/Internal.h>
-#include <IceGrid/Query.h>
-#include <IceGrid/Allocatable.h>
 
 namespace IceGrid
 {
 
 class ObjectCache;
 
-class ServerEntry;
-typedef IceUtil::Handle<ServerEntry> ServerEntryPtr;
-
-class ObjectEntry : public Allocatable
+class ObjectEntry : public IceUtil::Shared
 {
 public:
     
-    ObjectEntry(ObjectCache&, const ObjectInfo&, const std::string&, bool, const AllocatablePtr&);
+    ObjectEntry(ObjectCache&, const ObjectInfo&, const std::string&);
     Ice::ObjectPrx getProxy() const;
     std::string getType() const;
     std::string getApplication() const;
@@ -38,66 +32,29 @@ public:
 
     bool canRemove();
 
-    virtual void allocated(const SessionIPtr&);
-    virtual void released(const SessionIPtr&);
-    virtual bool canTryAllocate();
-
-    void  destroy();
-    virtual void checkAllocatable();
-
 private:
 
     ObjectCache& _cache;
     const ObjectInfo _info;
     const std::string _application;
-    bool _destroyed;
 };
 typedef IceUtil::Handle<ObjectEntry> ObjectEntryPtr;
 
-class ObjectAllocationRequest : public AllocationRequest
-{
-public:
-
-    ObjectAllocationRequest(const SessionIPtr& session) : AllocationRequest(session) { }
-    
-    virtual void response(const Ice::ObjectPrx&) = 0;
-    virtual void exception(const AllocationException&) = 0;
-
-private:
-
-    virtual bool allocated(const AllocatablePtr& allocatable, const SessionIPtr& session)
-    {
-	response(ObjectEntryPtr::dynamicCast(allocatable)->getObjectInfo().proxy);
-	return true;
-    }
-
-    virtual void canceled(const AllocationException& ex)
-    {
-	exception(ex);
-    }
-};
-typedef IceUtil::Handle<ObjectAllocationRequest> ObjectAllocationRequestPtr;
-
-class AdapterCache;
-
 class ObjectCache : public Cache<Ice::Identity, ObjectEntry>
 {
 public:
 
-    ObjectCache(const Ice::CommunicatorPtr&, AdapterCache&);
+    ObjectCache(const Ice::CommunicatorPtr&);
 
-    void add(const ObjectInfo&, const std::string&, bool, const AllocatablePtr&);
+    void add(const ObjectInfo&, const std::string&);
     ObjectEntryPtr get(const Ice::Identity&) const;
     ObjectEntryPtr remove(const Ice::Identity&);
 
-    void allocateByType(const std::string&, const ObjectAllocationRequestPtr&);
-    bool canTryAllocate(const ObjectEntryPtr&);
-
     Ice::ObjectProxySeq getObjectsByType(const std::string&); 
     ObjectInfoSeq getAll(const std::string&);
     ObjectInfoSeq getAllByType(const std::string&);
 
-    const Ice::CommunicatorPtr& communicator() const { return _communicator; }
+    const Ice::CommunicatorPtr& getCommunicator() const { return _communicator; }
 
 private:
     
@@ -110,24 +67,15 @@ private:
 	void add(const ObjectEntryPtr&);
 	bool remove(const ObjectEntryPtr&);
 	
-	void addAllocationRequest(const ObjectAllocationRequestPtr&);
-	bool canTryAllocate(const ObjectEntryPtr&, bool);
-
 	const std::vector<ObjectEntryPtr>& getObjects() const { return _objects; }
-	bool hasAllocatables() const;
 
     private:
 	
 	std::vector<ObjectEntryPtr> _objects;
-	std::list<ObjectAllocationRequestPtr> _requests;
-	int _allocatablesCount;
     };
 
-    Ice::CommunicatorPtr _communicator;
-    AdapterCache& _adapterCache;
-
+    const Ice::CommunicatorPtr _communicator;
     std::map<std::string, TypeEntry> _types;
-    std::map<std::string, std::vector<Ice::Identity> > _allocatablesByType;
 
     static std::pointer_to_unary_function<int, int> _rand;
 };