zeroc-ice 3.6b1 → 3.6.0

data/ext/ice/cpp/src/Ice/ReplyStatus.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/Ice/RequestHandler.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/Ice/RequestHandler.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -32,6 +32,7 @@ namespace IceInternal
 class BasicStream;
 
 class OutgoingBase;
+class ProxyOutgoingBase;
 
 //
 // An exception wrapper, which is used to notify that the request
@@ -63,15 +64,10 @@ class RequestHandler : public CancellationHandler
 {
 public:
 
-    virtual RequestHandlerPtr connect(const Ice::ObjectPrx&) = 0;
     virtual RequestHandlerPtr update(const RequestHandlerPtr&, const RequestHandlerPtr&) = 0;
 
-    virtual void prepareBatchRequest(BasicStream*) = 0;
-    virtual void finishBatchRequest(BasicStream*) = 0;
-    virtual void abortBatchRequest() = 0;
-
-    virtual bool sendRequest(OutgoingBase*) = 0;
-    virtual AsyncStatus sendAsyncRequest(const OutgoingAsyncBasePtr&) = 0;
+    virtual bool sendRequest(ProxyOutgoingBase*) = 0;
+    virtual AsyncStatus sendAsyncRequest(const ProxyOutgoingAsyncBasePtr&) = 0;
 
     const ReferencePtr& getReference() const { return _reference; } // Inlined for performances.
 

data/ext/ice/cpp/src/Ice/RequestHandlerFactory.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -22,49 +22,57 @@ RequestHandlerFactory::RequestHandlerFactory(const InstancePtr& instance) : _ins
 {
 }
 
-RequestHandlerPtr 
-IceInternal::RequestHandlerFactory::getRequestHandler(const ReferencePtr& ref, const Ice::ObjectPrx& proxy)
+RequestHandlerPtr
+IceInternal::RequestHandlerFactory::getRequestHandler(const RoutableReferencePtr& ref, const Ice::ObjectPrx& proxy)
 {
     if(ref->getCollocationOptimized())
     {
         Ice::ObjectAdapterPtr adapter = _instance->objectAdapterFactory()->findObjectAdapter(proxy);
         if(adapter)
         {
-            return new CollocatedRequestHandler(ref, adapter);
+            return proxy->__setRequestHandler(new CollocatedRequestHandler(ref, adapter));
         }
     }
 
+    ConnectRequestHandlerPtr handler;
+    bool connect = false;
     if(ref->getCacheConnection())
     {
         Lock sync(*this);
-        
-        map<ReferencePtr, RequestHandlerPtr>::iterator p = _handlers.find(ref);
-        if(p != _handlers.end())
+        map<ReferencePtr, ConnectRequestHandlerPtr>::iterator p = _handlers.find(ref);
+        if(p == _handlers.end())
         {
-            return p->second;
+            handler = new ConnectRequestHandler(ref, proxy);
+            _handlers.insert(make_pair(ref, handler));
+            connect = true;
+        }
+        else
+        {
+            handler = p->second;
         }
-        
-        RequestHandlerPtr handler = new ConnectRequestHandler(ref, proxy);
-        _handlers.insert(make_pair(ref, handler));
-        return handler;
     }
     else
     {
-        return new ConnectRequestHandler(ref, proxy);
+        handler = new ConnectRequestHandler(ref, proxy);
+        connect = true;
     }
+    if(connect)
+    {
+        ref->getConnection(handler.get());
+    }
+    return proxy->__setRequestHandler(handler->connect(proxy));
 }
 
-void 
+void
 IceInternal::RequestHandlerFactory::removeRequestHandler(const ReferencePtr& ref, const RequestHandlerPtr& handler)
 {
     if(ref->getCacheConnection())
     {
         Lock sync(*this);
-        map<ReferencePtr, RequestHandlerPtr>::iterator p = _handlers.find(ref);
+        map<ReferencePtr, ConnectRequestHandlerPtr>::iterator p = _handlers.find(ref);
         if(p != _handlers.end() && p->second.get() == handler.get())
         {
             _handlers.erase(p);
         }
     }
 }
-

data/ext/ice/cpp/src/Ice/RequestHandlerFactory.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -14,6 +14,7 @@
 #include <IceUtil/Mutex.h>
 
 #include <Ice/RequestHandlerF.h>
+#include <Ice/ConnectRequestHandlerF.h>
 #include <Ice/ProxyF.h>
 #include <Ice/ReferenceF.h>
 #include <Ice/InstanceF.h>
@@ -26,14 +27,14 @@ class RequestHandlerFactory : public IceUtil::Shared, private IceUtil::Mutex
 public:
 
     RequestHandlerFactory(const InstancePtr&);
-    
-    RequestHandlerPtr getRequestHandler(const ReferencePtr&, const Ice::ObjectPrx&);
+
+    RequestHandlerPtr getRequestHandler(const RoutableReferencePtr&, const Ice::ObjectPrx&);
     void removeRequestHandler(const ReferencePtr&, const RequestHandlerPtr&);
 
 private:
 
     const InstancePtr _instance;
-    std::map<ReferencePtr, RequestHandlerPtr> _handlers;
+    std::map<ReferencePtr, ConnectRequestHandlerPtr> _handlers;
 };
 
 }

data/ext/ice/cpp/src/Ice/ResponseHandler.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/Ice/ResponseHandler.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -25,9 +25,9 @@ class BasicStream;
 class ResponseHandler : virtual public ::IceUtil::Shared
 {
 public:
-    
+
     virtual ~ResponseHandler();
-    
+
     virtual void sendResponse(Ice::Int, BasicStream*, Ice::Byte, bool) = 0;
     virtual void sendNoResponse() = 0;
     virtual bool systemException(Ice::Int, const Ice::SystemException&, bool) = 0;

data/ext/ice/cpp/src/Ice/RetryQueue.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -11,6 +11,8 @@
 #include <Ice/OutgoingAsync.h>
 #include <Ice/LocalException.h>
 #include <Ice/Instance.h>
+#include <Ice/TraceLevels.h>
+#include <Ice/LoggerUtil.h>
 
 using namespace std;
 using namespace Ice;
@@ -18,8 +20,12 @@ using namespace IceInternal;
 
 IceUtil::Shared* IceInternal::upCast(RetryQueue* p) { return p; }
 
-IceInternal::RetryTask::RetryTask(const RetryQueuePtr& queue, const ProxyOutgoingAsyncBasePtr& outAsync) :
-    _queue(queue), _outAsync(outAsync)
+IceInternal::RetryTask::RetryTask(const InstancePtr& instance,
+                                  const RetryQueuePtr& queue,
+                                  const ProxyOutgoingAsyncBasePtr& outAsync) :
+    _instance(instance),
+    _queue(queue),
+    _outAsync(outAsync)
 {
 }
 
@@ -37,7 +43,7 @@ IceInternal::RetryTask::runTimerTask()
     _queue->remove(this);
 }
 
-void 
+void
 IceInternal::RetryTask::requestCanceled(OutgoingBase*, const Ice::LocalException&)
 {
     assert(false);
@@ -48,6 +54,11 @@ IceInternal::RetryTask::asyncRequestCanceled(const OutgoingAsyncBasePtr& outAsyn
 {
     if(_queue->cancel(this))
     {
+        if(_instance->traceLevels()->retry >= 1)
+        {
+            Trace out(_instance->initializationData().logger, _instance->traceLevels()->retryCat);
+            out << "operation retry canceled\n" << ex;
+        }
         if(_outAsync->completed(ex))
         {
             _outAsync->invokeCompletedAsync();
@@ -86,7 +97,7 @@ IceInternal::RetryQueue::add(const ProxyOutgoingAsyncBasePtr& out, int interval)
     {
         throw CommunicatorDestroyedException(__FILE__, __LINE__);
     }
-    RetryTaskPtr task = new RetryTask(this, out);
+    RetryTaskPtr task = new RetryTask(_instance, this, out);
     out->cancelable(task); // This will throw if the request is canceled.
     try
     {

data/ext/ice/cpp/src/Ice/RetryQueue.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -25,7 +25,7 @@ class RetryTask : public IceUtil::TimerTask, public CancellationHandler
 {
 public:
 
-    RetryTask(const RetryQueuePtr&, const ProxyOutgoingAsyncBasePtr&);
+    RetryTask(const InstancePtr&, const RetryQueuePtr&, const ProxyOutgoingAsyncBasePtr&);
 
     virtual void runTimerTask();
 
@@ -39,6 +39,7 @@ public:
 
 private:
 
+    const InstancePtr _instance;
     const RetryQueuePtr _queue;
     const ProxyOutgoingAsyncBasePtr _outAsync;
 };

data/ext/ice/cpp/src/Ice/RetryQueueF.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/Ice/Router.cpp

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 //
-// Ice version 3.6b
+// Ice version 3.6.0
 //
 // <auto-generated>
 //
@@ -32,8 +32,14 @@
 #include <IceUtil/PopDisableWarnings.h>
 
 #ifndef ICE_IGNORE_VERSION
-#   if ICE_INT_VERSION  != 30651
-#       error Ice version mismatch: an exact match is required for beta generated code
+#   if ICE_INT_VERSION / 100 != 306
+#       error Ice version mismatch!
+#   endif
+#   if ICE_INT_VERSION % 100 > 50
+#       error Beta header file detected
+#   endif
+#   if ICE_INT_VERSION % 100 < 0
+#       error Ice patch level mismatch!
 #   endif
 #endif
 
@@ -50,9 +56,9 @@ const ::std::string __Ice__RouterFinder__getRouter_name = "getRouter";
 
 }
 #ifdef __SUNPRO_CC
-class ICE_DECLSPEC_EXPORT IceProxy::Ice::Router;
+class ICE_API IceProxy::Ice::Router;
 #endif
-ICE_DECLSPEC_EXPORT ::IceProxy::Ice::Object* ::IceProxy::Ice::upCast(::IceProxy::Ice::Router* p) { return p; }
+ICE_API ::IceProxy::Ice::Object* ::IceProxy::Ice::upCast(::IceProxy::Ice::Router* p) { return p; }
 
 void
 ::IceProxy::Ice::__read(::IceInternal::BasicStream* __is, ::IceInternal::ProxyHandle< ::IceProxy::Ice::Router>& v)
@@ -287,14 +293,14 @@ IceProxy::Ice::Router::end_getServerProxy(const ::Ice::AsyncResultPtr& __result)
 }
 
 ::Ice::ObjectProxySeq
-IceProxy::Ice::Router::addProxies(const ::Ice::ObjectProxySeq& proxies, const ::Ice::Context* __ctx)
+IceProxy::Ice::Router::addProxies(const ::Ice::ObjectProxySeq& __p_proxies, const ::Ice::Context* __ctx)
 {
     __checkTwowayOnly(__Ice__Router__addProxies_name);
     ::IceInternal::Outgoing __og(this, __Ice__Router__addProxies_name, ::Ice::Idempotent, __ctx);
     try
     {
         ::IceInternal::BasicStream* __os = __og.startWriteParams(::Ice::DefaultFormat);
-        __os->write(proxies);
+        __os->write(__p_proxies);
         __og.endWriteParams();
     }
     catch(const ::Ice::LocalException& __ex)
@@ -321,7 +327,7 @@ IceProxy::Ice::Router::addProxies(const ::Ice::ObjectProxySeq& proxies, const ::
 }
 
 ::Ice::AsyncResultPtr
-IceProxy::Ice::Router::begin_addProxies(const ::Ice::ObjectProxySeq& proxies, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
+IceProxy::Ice::Router::begin_addProxies(const ::Ice::ObjectProxySeq& __p_proxies, const ::Ice::Context* __ctx, const ::IceInternal::CallbackBasePtr& __del, const ::Ice::LocalObjectPtr& __cookie)
 {
     __checkAsyncTwowayOnly(__Ice__Router__addProxies_name);
     ::IceInternal::OutgoingAsyncPtr __result = new ::IceInternal::OutgoingAsync(this, __Ice__Router__addProxies_name, __del, __cookie);
@@ -329,7 +335,7 @@ IceProxy::Ice::Router::begin_addProxies(const ::Ice::ObjectProxySeq& proxies, co
     {
         __result->prepare(__Ice__Router__addProxies_name, ::Ice::Idempotent, __ctx);
         ::IceInternal::BasicStream* __os = __result->startWriteParams(::Ice::DefaultFormat);
-        __os->write(proxies);
+        __os->write(__p_proxies);
         __result->endWriteParams();
         __result->invoke();
     }
@@ -343,7 +349,7 @@ IceProxy::Ice::Router::begin_addProxies(const ::Ice::ObjectProxySeq& proxies, co
 #ifdef ICE_CPP11
 
 ::Ice::AsyncResultPtr
-IceProxy::Ice::Router::__begin_addProxies(const ::Ice::ObjectProxySeq& proxies, const ::Ice::Context* __ctx, const ::IceInternal::Function<void (const ::Ice::ObjectProxySeq&)>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception, const ::IceInternal::Function<void (bool)>& __sent)
+IceProxy::Ice::Router::__begin_addProxies(const ::Ice::ObjectProxySeq& __p_proxies, const ::Ice::Context* __ctx, const ::IceInternal::Function<void (const ::Ice::ObjectProxySeq&)>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception, const ::IceInternal::Function<void (bool)>& __sent)
 {
     class Cpp11CB : public ::IceInternal::Cpp11FnCallbackNC
     {
@@ -379,7 +385,7 @@ IceProxy::Ice::Router::__begin_addProxies(const ::Ice::ObjectProxySeq& proxies,
         
         ::std::function<void (const ::Ice::ObjectProxySeq&)> _response;
     };
-    return begin_addProxies(proxies, __ctx, new Cpp11CB(__response, __exception, __sent));
+    return begin_addProxies(__p_proxies, __ctx, new Cpp11CB(__response, __exception, __sent));
 }
 #endif
 
@@ -417,9 +423,9 @@ IceProxy::Ice::Router::__newInstance() const
     return new Router;
 }
 #ifdef __SUNPRO_CC
-class ICE_DECLSPEC_EXPORT IceProxy::Ice::RouterFinder;
+class ICE_API IceProxy::Ice::RouterFinder;
 #endif
-ICE_DECLSPEC_EXPORT ::IceProxy::Ice::Object* ::IceProxy::Ice::upCast(::IceProxy::Ice::RouterFinder* p) { return p; }
+ICE_API ::IceProxy::Ice::Object* ::IceProxy::Ice::upCast(::IceProxy::Ice::RouterFinder* p) { return p; }
 
 void
 ::IceProxy::Ice::__read(::IceInternal::BasicStream* __is, ::IceInternal::ProxyHandle< ::IceProxy::Ice::RouterFinder>& v)
@@ -557,7 +563,7 @@ IceProxy::Ice::RouterFinder::__newInstance() const
     return new RouterFinder;
 }
 
-ICE_DECLSPEC_EXPORT ::Ice::Object* Ice::upCast(::Ice::Router* p) { return p; }
+ICE_API ::Ice::Object* Ice::upCast(::Ice::Router* p) { return p; }
 
 namespace
 {
@@ -627,10 +633,10 @@ Ice::Router::___addProxies(::IceInternal::Incoming& __inS, const ::Ice::Current&
 {
     __checkMode(::Ice::Idempotent, __current.mode);
     ::IceInternal::BasicStream* __is = __inS.startReadParams();
-    ::Ice::ObjectProxySeq proxies;
-    __is->read(proxies);
+    ::Ice::ObjectProxySeq __p_proxies;
+    __is->read(__p_proxies);
     __inS.endReadParams();
-    ::Ice::ObjectProxySeq __ret = addProxies(proxies, __current);
+    ::Ice::ObjectProxySeq __ret = addProxies(__p_proxies, __current);
     ::IceInternal::BasicStream* __os = __inS.__startWriteParams(::Ice::DefaultFormat);
     __os->write(__ret);
     __inS.__endWriteParams(true);
@@ -711,7 +717,7 @@ Ice::Router::__readImpl(::IceInternal::BasicStream* __is)
     __is->endReadSlice();
 }
 
-void ICE_DECLSPEC_EXPORT 
+void ICE_API 
 Ice::__patch(RouterPtr& handle, const ::Ice::ObjectPtr& v)
 {
     handle = ::Ice::RouterPtr::dynamicCast(v);
@@ -721,7 +727,7 @@ Ice::__patch(RouterPtr& handle, const ::Ice::ObjectPtr& v)
     }
 }
 
-ICE_DECLSPEC_EXPORT ::Ice::Object* Ice::upCast(::Ice::RouterFinder* p) { return p; }
+ICE_API ::Ice::Object* Ice::upCast(::Ice::RouterFinder* p) { return p; }
 
 namespace
 {
@@ -838,7 +844,7 @@ Ice::RouterFinder::__readImpl(::IceInternal::BasicStream* __is)
     __is->endReadSlice();
 }
 
-void ICE_DECLSPEC_EXPORT 
+void ICE_API 
 Ice::__patch(RouterFinderPtr& handle, const ::Ice::ObjectPtr& v)
 {
     handle = ::Ice::RouterFinderPtr::dynamicCast(v);

data/ext/ice/cpp/src/Ice/RouterF.cpp

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 //
-// Ice version 3.6b
+// Ice version 3.6.0
 //
 // <auto-generated>
 //
@@ -28,8 +28,14 @@
 #include <IceUtil/PopDisableWarnings.h>
 
 #ifndef ICE_IGNORE_VERSION
-#   if ICE_INT_VERSION  != 30651
-#       error Ice version mismatch: an exact match is required for beta generated code
+#   if ICE_INT_VERSION / 100 != 306
+#       error Ice version mismatch!
+#   endif
+#   if ICE_INT_VERSION % 100 > 50
+#       error Beta header file detected
+#   endif
+#   if ICE_INT_VERSION % 100 < 0
+#       error Ice patch level mismatch!
 #   endif
 #endif