Bug 2475 - remove AMD_Array_Object_ice_invoke

20 files changed, 35 insertions, 78 deletions

diff --git a/cpp/include/Ice/IncomingAsync.h b/cpp/include/Ice/IncomingAsync.h
index 1675350886f..069f3df2bc0 100644
--- a/cpp/include/Ice/IncomingAsync.h
+++ b/cpp/include/Ice/IncomingAsync.h
@@ -70,14 +70,6 @@ class ICE_API AMD_Object_ice_invoke : virtual public IceUtil::Shared
 public:
     
     virtual void ice_response(bool, const std::vector<Ice::Byte>&) = 0;
-    virtual void ice_exception(const std::exception&) = 0;
-    virtual void ice_exception() = 0;
-};
-
-class ICE_API AMD_Array_Object_ice_invoke : virtual public IceUtil::Shared
-{
-public:
-    
     virtual void ice_response(bool, const std::pair<const Ice::Byte*, const Ice::Byte*>&) = 0;
     virtual void ice_exception(const std::exception&) = 0;
     virtual void ice_exception() = 0;
@@ -98,17 +90,6 @@ public:
     AMD_Object_ice_invoke(IceInternal::Incoming&);
     
     virtual void ice_response(bool, const std::vector< ::Ice::Byte>&);
-    virtual void ice_exception(const std::exception&);
-    virtual void ice_exception();
-};
-
-class ICE_API AMD_Array_Object_ice_invoke : public ::Ice::AMD_Array_Object_ice_invoke, 
-                                            public IceInternal::IncomingAsync
-{
-public:
-    
-    AMD_Array_Object_ice_invoke(IceInternal::Incoming&);
-    
     virtual void ice_response(bool, const std::pair<const ::Ice::Byte*, const ::Ice::Byte*>&);
     virtual void ice_exception(const std::exception&);
     virtual void ice_exception();
diff --git a/cpp/include/Ice/Object.h b/cpp/include/Ice/Object.h
index b640aa1bd8d..f4d01da96cb 100644
--- a/cpp/include/Ice/Object.h
+++ b/cpp/include/Ice/Object.h
@@ -152,7 +152,7 @@ class ICE_API BlobjectArrayAsync : virtual public Object
 public:
 
     // Returns true if ok, false if user exception.
-    virtual void ice_invoke_async(const AMD_Array_Object_ice_invokePtr&, const std::pair<const Byte*, const Byte*>&,
+    virtual void ice_invoke_async(const AMD_Object_ice_invokePtr&, const std::pair<const Byte*, const Byte*>&,
                                   const Current&) = 0;
     virtual DispatchStatus __dispatch(IceInternal::Incoming&, const Current&);
 };
diff --git a/cpp/src/Freeze/BackgroundSaveEvictorI.cpp b/cpp/src/Freeze/BackgroundSaveEvictorI.cpp
index 996ff8b0b46..755d22beced 100644
--- a/cpp/src/Freeze/BackgroundSaveEvictorI.cpp
+++ b/cpp/src/Freeze/BackgroundSaveEvictorI.cpp
@@ -154,8 +154,8 @@ Freeze::BackgroundSaveEvictorI::BackgroundSaveEvictorI(const ObjectAdapterPtr& a
                                                        const ServantInitializerPtr& initializer,
                                                        const vector<IndexPtr>& indices,
                                                        bool createDb) :
-    Thread("Freeze background save evictor thread"),
     EvictorI<BackgroundSaveEvictorElement>(adapter, envName, dbEnv, filename, FacetTypeMap(), initializer, indices, createDb),
+    Thread("Freeze background save evictor thread"),
     _currentEvictorSize(0),
     _savingThreadDone(false)
 {
diff --git a/cpp/src/Glacier2/Blobject.cpp b/cpp/src/Glacier2/Blobject.cpp
index ae3ae5441b6..e0799fd3b61 100644
--- a/cpp/src/Glacier2/Blobject.cpp
+++ b/cpp/src/Glacier2/Blobject.cpp
@@ -30,7 +30,7 @@ class AMI_Array_Object_ice_invokeTwowayI : public AMI_Array_Object_ice_invoke
 {
 public:
 
-    AMI_Array_Object_ice_invokeTwowayI(const AMD_Array_Object_ice_invokePtr& amdCB,
+    AMI_Array_Object_ice_invokeTwowayI(const AMD_Object_ice_invokePtr& amdCB,
                                        const InstancePtr& instance,
                                        const ConnectionPtr& connection) :
         _amdCB(amdCB),
@@ -72,7 +72,7 @@ public:
 
 private:
 
-    const AMD_Array_Object_ice_invokePtr _amdCB;
+    const AMD_Object_ice_invokePtr _amdCB;
     const InstancePtr _instance;
     const ConnectionPtr _connection;
 };
@@ -81,7 +81,7 @@ class AMI_Array_Object_ice_invokeOnewayI : public AMI_Array_Object_ice_invoke, p
 {
 public:
 
-    AMI_Array_Object_ice_invokeOnewayI(const AMD_Array_Object_ice_invokePtr& amdCB,
+    AMI_Array_Object_ice_invokeOnewayI(const AMD_Object_ice_invokePtr& amdCB,
                                        const InstancePtr& instance,
                                        const ConnectionPtr& connection) :
         _amdCB(amdCB),
@@ -129,7 +129,7 @@ public:
 
 private:
 
-    const AMD_Array_Object_ice_invokePtr _amdCB;
+    const AMD_Object_ice_invokePtr _amdCB;
     const InstancePtr _instance;
     const ConnectionPtr _connection;
 };
@@ -167,7 +167,7 @@ Glacier2::Blobject::~Blobject()
 }
 
 void
-Glacier2::Blobject::invoke(ObjectPrx& proxy, const AMD_Array_Object_ice_invokePtr& amdCB, 
+Glacier2::Blobject::invoke(ObjectPrx& proxy, const AMD_Object_ice_invokePtr& amdCB, 
                            const std::pair<const Ice::Byte*, const Ice::Byte*>& inParams, const Current& current)
 {
     //
diff --git a/cpp/src/Glacier2/Blobject.h b/cpp/src/Glacier2/Blobject.h
index 06c9a2da327..96e90087d59 100644
--- a/cpp/src/Glacier2/Blobject.h
+++ b/cpp/src/Glacier2/Blobject.h
@@ -26,7 +26,7 @@ public:
 
 protected:
 
-    void invoke(Ice::ObjectPrx&, const Ice::AMD_Array_Object_ice_invokePtr&, 
+    void invoke(Ice::ObjectPrx&, const Ice::AMD_Object_ice_invokePtr&, 
                 const std::pair<const Ice::Byte*, const Ice::Byte*>&, const Ice::Current&);
 
     const InstancePtr _instance;
diff --git a/cpp/src/Glacier2/ClientBlobject.cpp b/cpp/src/Glacier2/ClientBlobject.cpp
index abbec4688a4..857cf85bed6 100644
--- a/cpp/src/Glacier2/ClientBlobject.cpp
+++ b/cpp/src/Glacier2/ClientBlobject.cpp
@@ -32,7 +32,7 @@ Glacier2::ClientBlobject::~ClientBlobject()
 }
 
 void
-Glacier2::ClientBlobject::ice_invoke_async(const Ice::AMD_Array_Object_ice_invokePtr& amdCB, 
+Glacier2::ClientBlobject::ice_invoke_async(const Ice::AMD_Object_ice_invokePtr& amdCB, 
                                            const std::pair<const Byte*, const Byte*>& inParams,
                                            const Current& current)
 {
diff --git a/cpp/src/Glacier2/ClientBlobject.h b/cpp/src/Glacier2/ClientBlobject.h
index b249fba906c..5fb9282bbea 100644
--- a/cpp/src/Glacier2/ClientBlobject.h
+++ b/cpp/src/Glacier2/ClientBlobject.h
@@ -34,7 +34,7 @@ public:
     ClientBlobject(const InstancePtr&, const FilterManagerPtr&, const Ice::Context&); 
     virtual ~ClientBlobject();
 
-    virtual void ice_invoke_async(const Ice::AMD_Array_Object_ice_invokePtr&,
+    virtual void ice_invoke_async(const Ice::AMD_Object_ice_invokePtr&,
                                   const std::pair<const Ice::Byte*, const Ice::Byte*>&, const Ice::Current&);
 
     Ice::ObjectProxySeq add(const Ice::ObjectProxySeq&, const Ice::Current&); // Returns evicted proxies.
diff --git a/cpp/src/Glacier2/RequestQueue.cpp b/cpp/src/Glacier2/RequestQueue.cpp
index 716e66144ef..61f85b2c34a 100644
--- a/cpp/src/Glacier2/RequestQueue.cpp
+++ b/cpp/src/Glacier2/RequestQueue.cpp
@@ -25,7 +25,7 @@ class AMI_Array_Object_ice_invokeI : public AMI_Array_Object_ice_invoke
 {
 public:
     
-    AMI_Array_Object_ice_invokeI(const AMD_Array_Object_ice_invokePtr& amdCB,
+    AMI_Array_Object_ice_invokeI(const AMD_Object_ice_invokePtr& amdCB,
                                  const InstancePtr& instance,
                                  const ConnectionPtr& connection) :
         _amdCB(amdCB),
@@ -73,7 +73,7 @@ public:
 
 private:
 
-    const AMD_Array_Object_ice_invokePtr _amdCB;
+    const AMD_Object_ice_invokePtr _amdCB;
     const InstancePtr _instance;
     const ConnectionPtr _connection;
 };
@@ -82,7 +82,7 @@ private:
 
 Glacier2::Request::Request(const ObjectPrx& proxy, const std::pair<const Byte*, const Byte*>& inParams,
                            const Current& current, bool forwardContext, const Ice::Context& sslContext,
-                           const AMD_Array_Object_ice_invokePtr& amdCB) :
+                           const AMD_Object_ice_invokePtr& amdCB) :
     _proxy(proxy),
     _inParams(inParams.first, inParams.second),
     _current(current),
diff --git a/cpp/src/Glacier2/RequestQueue.h b/cpp/src/Glacier2/RequestQueue.h
index 5bda90a5794..bfb15320da2 100644
--- a/cpp/src/Glacier2/RequestQueue.h
+++ b/cpp/src/Glacier2/RequestQueue.h
@@ -31,7 +31,7 @@ class Request : public IceUtil::Shared
 public:
 
     Request(const Ice::ObjectPrx&, const std::pair<const Ice::Byte*, const Ice::Byte*>&, const Ice::Current&, bool,
-            const Ice::Context&, const Ice::AMD_Array_Object_ice_invokePtr&);
+            const Ice::Context&, const Ice::AMD_Object_ice_invokePtr&);
     
     bool invoke(const InstancePtr&, const Ice::ConnectionPtr&);
     bool override(const RequestPtr&) const;
@@ -46,7 +46,7 @@ private:
     const bool _forwardContext;
     const Ice::Context _sslContext;
     const std::string _override;
-    const Ice::AMD_Array_Object_ice_invokePtr _amdCB;
+    const Ice::AMD_Object_ice_invokePtr _amdCB;
 };
 
 class RequestQueue : public IceUtil::Mutex, public IceUtil::Shared
diff --git a/cpp/src/Glacier2/ServerBlobject.cpp b/cpp/src/Glacier2/ServerBlobject.cpp
index 377a5db830b..fa6524e5fde 100644
--- a/cpp/src/Glacier2/ServerBlobject.cpp
+++ b/cpp/src/Glacier2/ServerBlobject.cpp
@@ -23,7 +23,7 @@ Glacier2::ServerBlobject::~ServerBlobject()
 }
 
 void
-Glacier2::ServerBlobject::ice_invoke_async(const Ice::AMD_Array_Object_ice_invokePtr& amdCB,
+Glacier2::ServerBlobject::ice_invoke_async(const Ice::AMD_Object_ice_invokePtr& amdCB,
                                            const std::pair<const Byte*, const Byte*>& inParams,
                                            const Current& current)
 {
diff --git a/cpp/src/Glacier2/ServerBlobject.h b/cpp/src/Glacier2/ServerBlobject.h
index d6dce8056aa..44ffefa02e4 100644
--- a/cpp/src/Glacier2/ServerBlobject.h
+++ b/cpp/src/Glacier2/ServerBlobject.h
@@ -25,7 +25,7 @@ public:
     ServerBlobject(const InstancePtr&, const Ice::ConnectionPtr&);
     virtual ~ServerBlobject();
 
-    virtual void ice_invoke_async(const Ice::AMD_Array_Object_ice_invokePtr&,
+    virtual void ice_invoke_async(const Ice::AMD_Object_ice_invokePtr&,
                                   const std::pair<const Ice::Byte*, const Ice::Byte*>&, const Ice::Current&);
 };
 
diff --git a/cpp/src/Ice/IncomingAsync.cpp b/cpp/src/Ice/IncomingAsync.cpp
index 5324af0508b..9a4ec61aa81 100644
--- a/cpp/src/Ice/IncomingAsync.cpp
+++ b/cpp/src/Ice/IncomingAsync.cpp
@@ -24,7 +24,6 @@ using namespace IceInternal;
 
 IceUtil::Shared* IceInternal::upCast(IncomingAsync* p) { return p; }
 IceUtil::Shared* IceInternal::upCast(AMD_Object_ice_invoke* p) { return p; }
-IceUtil::Shared* IceInternal::upCast(AMD_Array_Object_ice_invoke* p) { return p; }
 
 IceInternal::IncomingAsync::IncomingAsync(Incoming& in) :
     IncomingBase(in),
@@ -265,30 +264,7 @@ IceAsync::Ice::AMD_Object_ice_invoke::ice_response(bool ok, const vector<Byte>&
 }
 
 void
-IceAsync::Ice::AMD_Object_ice_invoke::ice_exception(const std::exception& ex)
-{
-    if(__validateException(ex))
-    {
-        __exception(ex);
-    }
-}
-
-void
-IceAsync::Ice::AMD_Object_ice_invoke::ice_exception()
-{
-    if(__validateException())
-    {
-        __exception();
-    }
-}
-
-IceAsync::Ice::AMD_Array_Object_ice_invoke::AMD_Array_Object_ice_invoke(Incoming& in) :
-    IncomingAsync(in)
-{
-}
-
-void
-IceAsync::Ice::AMD_Array_Object_ice_invoke::ice_response(bool ok, const pair<const Byte*, const Byte*>& outParams)
+IceAsync::Ice::AMD_Object_ice_invoke::ice_response(bool ok, const pair<const Byte*, const Byte*>& outParams)
 {
     if(__validateResponse(ok))
     {
@@ -306,8 +282,8 @@ IceAsync::Ice::AMD_Array_Object_ice_invoke::ice_response(bool ok, const pair<con
 }
 
 void
-IceAsync::Ice::AMD_Array_Object_ice_invoke::ice_exception(const std::exception& ex)
-{ 
+IceAsync::Ice::AMD_Object_ice_invoke::ice_exception(const std::exception& ex)
+{
     if(__validateException(ex))
     {
         __exception(ex);
@@ -315,7 +291,7 @@ IceAsync::Ice::AMD_Array_Object_ice_invoke::ice_exception(const std::exception&
 }
 
 void
-IceAsync::Ice::AMD_Array_Object_ice_invoke::ice_exception()
+IceAsync::Ice::AMD_Object_ice_invoke::ice_exception()
 {
     if(__validateException())
     {
diff --git a/cpp/src/Ice/Object.cpp b/cpp/src/Ice/Object.cpp
index 5ab01491aad..3050bbd67df 100644
--- a/cpp/src/Ice/Object.cpp
+++ b/cpp/src/Ice/Object.cpp
@@ -431,7 +431,7 @@ Ice::BlobjectArrayAsync::__dispatch(Incoming& in, const Current& current)
     is->readBlob(inParams.first, sz);
     inParams.second = inParams.first + sz;
     is->endReadEncaps();
-    AMD_Array_Object_ice_invokePtr cb = new ::IceAsync::Ice::AMD_Array_Object_ice_invoke(in);
+    AMD_Object_ice_invokePtr cb = new ::IceAsync::Ice::AMD_Object_ice_invoke(in);
     try
     {
         ice_invoke_async(cb, inParams, current);
diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp
index c04f6f45b22..939cfc61f69 100644
--- a/cpp/src/Ice/Reference.cpp
+++ b/cpp/src/Ice/Reference.cpp
@@ -1499,7 +1499,7 @@ IceInternal::RoutableReference::getConnectionNoRouterInfo(const GetConnectionCal
             {
                 try
                 {
-                    throw;
+                    exc.ice_throw();
                 }
                 catch(const Ice::NoEndpointException& ex)
                 {
diff --git a/cpp/src/IceGrid/AdminCallbackRouter.cpp b/cpp/src/IceGrid/AdminCallbackRouter.cpp
index 03d7481c9d5..87191b43352 100644
--- a/cpp/src/IceGrid/AdminCallbackRouter.cpp
+++ b/cpp/src/IceGrid/AdminCallbackRouter.cpp
@@ -19,7 +19,7 @@ class AMICallback : public AMI_Array_Object_ice_invoke
 {
 public:
 
-    AMICallback(const AMD_Array_Object_ice_invokePtr& cb) :
+    AMICallback(const AMD_Object_ice_invokePtr& cb) :
         _cb(cb)
     {
     }
@@ -35,7 +35,7 @@ public:
     }
     
 private:
-    AMD_Array_Object_ice_invokePtr _cb;
+    AMD_Object_ice_invokePtr _cb;
 };
 
 }
@@ -69,7 +69,7 @@ IceGrid::AdminCallbackRouter::removeMapping(const string& category)
 
 
 void
-IceGrid::AdminCallbackRouter::ice_invoke_async(const AMD_Array_Object_ice_invokePtr& cb, 
+IceGrid::AdminCallbackRouter::ice_invoke_async(const AMD_Object_ice_invokePtr& cb, 
                                                const pair<const Byte*, const Byte*>& inParams,
                                                const Current& current)
 {
diff --git a/cpp/src/IceGrid/AdminCallbackRouter.h b/cpp/src/IceGrid/AdminCallbackRouter.h
index 34fdb5dbe87..ec3bac7db78 100644
--- a/cpp/src/IceGrid/AdminCallbackRouter.h
+++ b/cpp/src/IceGrid/AdminCallbackRouter.h
@@ -30,7 +30,7 @@ public:
     void removeMapping(const std::string&);
 
 
-    virtual void ice_invoke_async(const Ice::AMD_Array_Object_ice_invokePtr&,
+    virtual void ice_invoke_async(const Ice::AMD_Object_ice_invokePtr&,
                                   const std::pair<const Ice::Byte*, const Ice::Byte*>&,
                                   const Ice::Current&);
     
diff --git a/cpp/src/IceGrid/NodeServerAdminRouter.cpp b/cpp/src/IceGrid/NodeServerAdminRouter.cpp
index 558d517e0f9..ff983e10434 100644
--- a/cpp/src/IceGrid/NodeServerAdminRouter.cpp
+++ b/cpp/src/IceGrid/NodeServerAdminRouter.cpp
@@ -23,7 +23,7 @@ class AMICallback : public AMI_Array_Object_ice_invoke
 {
 public:
 
-    AMICallback(const AMD_Array_Object_ice_invokePtr& cb) :
+    AMICallback(const AMD_Object_ice_invokePtr& cb) :
         _cb(cb)
     {
     }
@@ -39,7 +39,7 @@ public:
     }
     
 private:
-    AMD_Array_Object_ice_invokePtr _cb;
+    AMD_Object_ice_invokePtr _cb;
 };
 
 }
@@ -50,7 +50,7 @@ IceGrid::NodeServerAdminRouter::NodeServerAdminRouter(const NodeIPtr& node) :
 }
 
 void
-IceGrid::NodeServerAdminRouter::ice_invoke_async(const AMD_Array_Object_ice_invokePtr& cb, 
+IceGrid::NodeServerAdminRouter::ice_invoke_async(const AMD_Object_ice_invokePtr& cb, 
                                                  const pair<const Byte*, const Byte*>& inParams,
                                                  const Current& current)
 {
diff --git a/cpp/src/IceGrid/NodeServerAdminRouter.h b/cpp/src/IceGrid/NodeServerAdminRouter.h
index b984b396a69..f784b6d56ed 100644
--- a/cpp/src/IceGrid/NodeServerAdminRouter.h
+++ b/cpp/src/IceGrid/NodeServerAdminRouter.h
@@ -21,7 +21,7 @@ public:
     
     NodeServerAdminRouter(const NodeIPtr&);
 
-    virtual void ice_invoke_async(const Ice::AMD_Array_Object_ice_invokePtr&, 
+    virtual void ice_invoke_async(const Ice::AMD_Object_ice_invokePtr&, 
                                   const std::pair<const Ice::Byte*, const Ice::Byte*>&,
                                   const Ice::Current&);
 
diff --git a/cpp/src/IceGrid/RegistryServerAdminRouter.cpp b/cpp/src/IceGrid/RegistryServerAdminRouter.cpp
index 0294b6b032e..21566a4bc52 100644
--- a/cpp/src/IceGrid/RegistryServerAdminRouter.cpp
+++ b/cpp/src/IceGrid/RegistryServerAdminRouter.cpp
@@ -21,7 +21,7 @@ class AMICallback : public AMI_Array_Object_ice_invoke
 {
 public:
 
-    AMICallback(const AMD_Array_Object_ice_invokePtr& cb) :
+    AMICallback(const AMD_Object_ice_invokePtr& cb) :
         _cb(cb)
     {
     }
@@ -37,7 +37,7 @@ public:
     }
     
 private:
-    AMD_Array_Object_ice_invokePtr _cb;
+    AMD_Object_ice_invokePtr _cb;
 };
 
 }
@@ -48,7 +48,7 @@ IceGrid::RegistryServerAdminRouter::RegistryServerAdminRouter(const DatabasePtr&
 }
 
 void
-IceGrid::RegistryServerAdminRouter::ice_invoke_async(const AMD_Array_Object_ice_invokePtr& cb, 
+IceGrid::RegistryServerAdminRouter::ice_invoke_async(const AMD_Object_ice_invokePtr& cb, 
                                                      const pair<const Byte*, const Byte*>& inParams,
                                                      const Current& current)
 {
diff --git a/cpp/src/IceGrid/RegistryServerAdminRouter.h b/cpp/src/IceGrid/RegistryServerAdminRouter.h
index a65edfe4159..e3d3d244b31 100644
--- a/cpp/src/IceGrid/RegistryServerAdminRouter.h
+++ b/cpp/src/IceGrid/RegistryServerAdminRouter.h
@@ -21,7 +21,7 @@ public:
     
     RegistryServerAdminRouter(const DatabasePtr&);
 
-    virtual void ice_invoke_async(const Ice::AMD_Array_Object_ice_invokePtr&, 
+    virtual void ice_invoke_async(const Ice::AMD_Object_ice_invokePtr&, 
                                   const std::pair<const Ice::Byte*, const Ice::Byte*>&,
                                   const Ice::Current&);