HEAD:(zeroc-ice/ice@765d81587a) Fix raising of RequestFailedException…

… in Python (zeroc-ice/ice#2589)

slice2cpp/cpp/src/IceGrid/Internal.cpp

@@ -1585,11 +1585,11 @@ IceGrid::ReplicaSessionPrx::_iceI_setAdapterDirectProxy(const ::std::shared_ptr<
             {
                 ex.ice_throw();
             }
-            catch(const AdapterExistsException&)
+            catch(const AdapterNotExistException&)
             {
                 throw;
             }
-            catch(const AdapterNotExistException&)
+            catch(const AdapterExistsException&)
             {
                 throw;
             }
@@ -1700,11 +1700,11 @@ IceGrid::InternalRegistryPrx::_iceI_registerNode(const ::std::shared_ptr<::IceIn
             {
                 ex.ice_throw();
             }
-            catch(const NodeActiveException&)
+            catch(const PermissionDeniedException&)
             {
                 throw;
             }
-            catch(const PermissionDeniedException&)
+            catch(const NodeActiveException&)
             {
                 throw;
             }
@@ -1750,11 +1750,11 @@ IceGrid::InternalRegistryPrx::_iceI_registerReplica(const ::std::shared_ptr<::Ic
             {
                 ex.ice_throw();
             }
-            catch(const ReplicaActiveException&)
+            catch(const PermissionDeniedException&)
             {
                 throw;
             }
-            catch(const PermissionDeniedException&)
+            catch(const ReplicaActiveException&)
             {
                 throw;
             }

slice2cpp/python/test/Ice/exceptions/Test.cpp

@@ -850,6 +850,37 @@ Test::ThrowerPrx::_iceI_throwMarshalException(const ::std::shared_ptr<::IceInter
         });
 }
 
+void
+Test::ThrowerPrx::throwRequestFailedException(::std::string_view iceP_type, const ::Ice::Identity& iceP_id, ::std::string_view iceP_facet, ::std::string_view iceP_operation, const ::Ice::Context& context) const
+{
+    ::IceInternal::makePromiseOutgoing<void>(true, this, &ThrowerPrx::_iceI_throwRequestFailedException, iceP_type, iceP_id, iceP_facet, iceP_operation, context).get();
+}
+
+::std::future<void>
+Test::ThrowerPrx::throwRequestFailedExceptionAsync(::std::string_view iceP_type, const ::Ice::Identity& iceP_id, ::std::string_view iceP_facet, ::std::string_view iceP_operation, const ::Ice::Context& context) const
+{
+    return ::IceInternal::makePromiseOutgoing<void>(false, this, &ThrowerPrx::_iceI_throwRequestFailedException, iceP_type, iceP_id, iceP_facet, iceP_operation, context);
+}
+
+::std::function<void()>
+Test::ThrowerPrx::throwRequestFailedExceptionAsync(::std::string_view iceP_type, const ::Ice::Identity& iceP_id, ::std::string_view iceP_facet, ::std::string_view iceP_operation, ::std::function<void()> response, ::std::function<void(::std::exception_ptr)> ex, ::std::function<void(bool)> sent, const ::Ice::Context& context) const
+{
+    return ::IceInternal::makeLambdaOutgoing<void>(::std::move(response), ::std::move(ex), ::std::move(sent), this, &Test::ThrowerPrx::_iceI_throwRequestFailedException, iceP_type, iceP_id, iceP_facet, iceP_operation, context);
+}
+
+void
+Test::ThrowerPrx::_iceI_throwRequestFailedException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>& outAsync, ::std::string_view iceP_type, const ::Ice::Identity& iceP_id, ::std::string_view iceP_facet, ::std::string_view iceP_operation, const ::Ice::Context& context) const
+{
+    static constexpr ::std::string_view operationName = "throwRequestFailedException";
+
+    outAsync->invoke(operationName, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context,
+        [&](::Ice::OutputStream* ostr)
+        {
+            ostr->writeAll(iceP_type, iceP_id, iceP_facet, iceP_operation);
+        },
+        nullptr);
+}
+
 const char*
 Test::ThrowerPrx::ice_staticId() noexcept
 {
@@ -1423,14 +1454,32 @@ Test::Thrower::_iceD_throwMarshalException(::Ice::IncomingRequest& request, ::st
 }
 /// \endcond
 
+/// \cond INTERNAL
+void
+Test::Thrower::_iceD_throwRequestFailedException(::Ice::IncomingRequest& request, ::std::function<void(::Ice::OutgoingResponse)> sendResponse)
+{
+    _iceCheckMode(::Ice::OperationMode::Normal, request.current().mode);
+    auto istr = &request.inputStream();
+    istr->startEncapsulation();
+    ::std::string iceP_type;
+    ::Ice::Identity iceP_id;
+    ::std::string iceP_facet;
+    ::std::string iceP_operation;
+    istr->readAll(iceP_type, iceP_id, iceP_facet, iceP_operation);
+    istr->endEncapsulation();
+    this->throwRequestFailedException(::std::move(iceP_type), ::std::move(iceP_id), ::std::move(iceP_facet), ::std::move(iceP_operation), request.current());
+    sendResponse(::Ice::makeEmptyOutgoingResponse(request.current()));
+}
+/// \endcond
+
 /// \cond INTERNAL
 void
 Test::Thrower::dispatch(::Ice::IncomingRequest& request, ::std::function<void(::Ice::OutgoingResponse)> sendResponse)
 {
-    static constexpr ::std::string_view allOperations[] = {"ice_id", "ice_ids", "ice_isA", "ice_ping", "shutdown", "supportsAssertException", "supportsUndeclaredExceptions", "throwAasA", "throwAfterException", "throwAfterResponse", "throwAorDasAorD", "throwAssertException", "throwBasA", "throwBasB", "throwCasA", "throwCasB", "throwCasC", "throwLocalException", "throwLocalExceptionIdempotent", "throwMarshalException", "throwMemoryLimitException", "throwModA", "throwNonIceException", "throwUndeclaredA", "throwUndeclaredB", "throwUndeclaredC"};
+    static constexpr ::std::string_view allOperations[] = {"ice_id", "ice_ids", "ice_isA", "ice_ping", "shutdown", "supportsAssertException", "supportsUndeclaredExceptions", "throwAasA", "throwAfterException", "throwAfterResponse", "throwAorDasAorD", "throwAssertException", "throwBasA", "throwBasB", "throwCasA", "throwCasB", "throwCasC", "throwLocalException", "throwLocalExceptionIdempotent", "throwMarshalException", "throwMemoryLimitException", "throwModA", "throwNonIceException", "throwRequestFailedException", "throwUndeclaredA", "throwUndeclaredB", "throwUndeclaredC"};
 
     const ::Ice::Current& current = request.current();
-    ::std::pair<const ::std::string_view*, const ::std::string_view*> r = ::std::equal_range(allOperations, allOperations + 26, current.operation);
+    ::std::pair<const ::std::string_view*, const ::std::string_view*> r = ::std::equal_range(allOperations, allOperations + 27, current.operation);
     if(r.first == r.second)
     {
         sendResponse(::Ice::makeOutgoingResponse(::std::make_exception_ptr(::Ice::OperationNotExistException(__FILE__, __LINE__)), current));
@@ -1556,15 +1605,20 @@ Test::Thrower::dispatch(::Ice::IncomingRequest& request, ::std::function<void(::
         }
         case 23:
         {
-            _iceD_throwUndeclaredA(request, ::std::move(sendResponse));
+            _iceD_throwRequestFailedException(request, ::std::move(sendResponse));
             break;
         }
         case 24:
         {
-            _iceD_throwUndeclaredB(request, ::std::move(sendResponse));
+            _iceD_throwUndeclaredA(request, ::std::move(sendResponse));
             break;
         }
         case 25:
+        {
+            _iceD_throwUndeclaredB(request, ::std::move(sendResponse));
+            break;
+        }
+        case 26:
         {
             _iceD_throwUndeclaredC(request, ::std::move(sendResponse));
             break;

slice2cpp/python/test/Ice/exceptions/Test.h

@@ -19,6 +19,7 @@
 #include <Ice/PushDisableWarnings.h>
 #include <Ice/Ice.h>
 #include <Ice/BuiltinSequences.h>
+#include <Ice/Identity.h>
 
 #ifndef ICE_IGNORE_VERSION
 #   if ICE_INT_VERSION  != 30850
@@ -336,6 +337,17 @@ class ThrowerPrx : public ::Ice::Proxy<ThrowerPrx, ::Ice::ObjectPrx>
     void _iceI_throwMarshalException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::tuple<::std::int32_t, ::std::int32_t>>>&, const ::Ice::Context&) const;
     /// \endcond
 
+    void throwRequestFailedException(::std::string_view type, const ::Ice::Identity& id, ::std::string_view facet, ::std::string_view operation, const ::Ice::Context& context = ::Ice::noExplicitContext) const;
+
+    ::std::future<void> throwRequestFailedExceptionAsync(::std::string_view type, const ::Ice::Identity& id, ::std::string_view facet, ::std::string_view operation, const ::Ice::Context& context = ::Ice::noExplicitContext) const;
+
+    ::std::function<void()>
+    throwRequestFailedExceptionAsync(::std::string_view type, const ::Ice::Identity& id, ::std::string_view facet, ::std::string_view operation, ::std::function<void()> response, ::std::function<void(::std::exception_ptr)> ex = nullptr, ::std::function<void(bool)> sent = nullptr, const ::Ice::Context& context = ::Ice::noExplicitContext) const;
+
+    /// \cond INTERNAL
+    void _iceI_throwRequestFailedException(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>&, ::std::string_view, const ::Ice::Identity&, ::std::string_view, ::std::string_view, const ::Ice::Context&) const;
+    /// \endcond
+
     /**
      * Obtains the Slice type ID of this interface.
      * @return The fully-scoped type ID.
@@ -835,6 +847,11 @@ class Thrower : public virtual ::Ice::Object
     void _iceD_throwMarshalException(::Ice::IncomingRequest&, ::std::function<void(::Ice::OutgoingResponse)>);
     /// \endcond
 
+    virtual void throwRequestFailedException(::std::string type, ::Ice::Identity id, ::std::string facet, ::std::string operation, const ::Ice::Current& current) = 0;
+    /// \cond INTERNAL
+    void _iceD_throwRequestFailedException(::Ice::IncomingRequest&, ::std::function<void(::Ice::OutgoingResponse)>);
+    /// \endcond
+
     /// \cond INTERNAL
     void dispatch(::Ice::IncomingRequest&, ::std::function<void(::Ice::OutgoingResponse)>) override;
     /// \endcond

slice2cs/cpp/src/IceGrid/Internal.cs

@@ -6728,10 +6728,10 @@ public abstract class ServerDisp_ : Ice.ObjectImpl, Server
 
         public abstract global::System.Threading.Tasks.Task setProcessAsync(global::Ice.ProcessPrx? proc, Ice.Current current);
 
-        public abstract long getOffsetFromEnd(string filename, int lines, Ice.Current current);
-
         public abstract bool read(string filename, long pos, int size, out long newPos, out string[] lines, Ice.Current current);
 
+        public abstract long getOffsetFromEnd(string filename, int lines, Ice.Current current);
+
         public override string ice_id(Ice.Current current) => ice_staticId();
 
         public static new string ice_staticId() => "::IceGrid::Server";
@@ -6811,8 +6811,6 @@ public abstract class NodeDisp_ : Ice.ObjectImpl, Node
 
         public abstract void shutdown(Ice.Current current);
 
-        public abstract long getOffsetFromEnd(string filename, int lines, Ice.Current current);
-
         public abstract bool read(string filename, long pos, int size, out long newPos, out string[] lines, Ice.Current current);
 
         public abstract void replicaInit(InternalRegistryPrx?[] replicas, Ice.Current current);
@@ -6821,6 +6819,8 @@ public abstract class NodeDisp_ : Ice.ObjectImpl, Node
 
         public abstract void replicaRemoved(InternalRegistryPrx? replica, Ice.Current current);
 
+        public abstract long getOffsetFromEnd(string filename, int lines, Ice.Current current);
+
         public override string ice_id(Ice.Current current) => ice_staticId();
 
         public static new string ice_staticId() => "::IceGrid::Node";
@@ -7014,10 +7014,10 @@ public abstract class InternalRegistryDisp_ : Ice.ObjectImpl, InternalRegistry
 
         public abstract void shutdown(Ice.Current current);
 
-        public abstract long getOffsetFromEnd(string filename, int lines, Ice.Current current);
-
         public abstract bool read(string filename, long pos, int size, out long newPos, out string[] lines, Ice.Current current);
 
+        public abstract long getOffsetFromEnd(string filename, int lines, Ice.Current current);
+
         public override string ice_id(Ice.Current current) => ice_staticId();
 
         public static new string ice_staticId() => "::IceGrid::InternalRegistry";

slice2cs/cpp/test/Ice/location/Test.cs

@@ -1168,10 +1168,10 @@ public abstract class TestLocatorRegistryDisp_ : Ice.ObjectImpl, TestLocatorRegi
 
         public abstract global::System.Threading.Tasks.Task setAdapterDirectProxyAsync(string id, global::Ice.ObjectPrx? proxy, Ice.Current current);
 
-        public abstract global::System.Threading.Tasks.Task setReplicatedAdapterDirectProxyAsync(string adapterId, string replicaGroupId, global::Ice.ObjectPrx? proxy, Ice.Current current);
-
         public abstract global::System.Threading.Tasks.Task setServerProcessProxyAsync(string id, global::Ice.ProcessPrx? proxy, Ice.Current current);
 
+        public abstract global::System.Threading.Tasks.Task setReplicatedAdapterDirectProxyAsync(string adapterId, string replicaGroupId, global::Ice.ObjectPrx? proxy, Ice.Current current);
+
         public override string ice_id(Ice.Current current) => ice_staticId();
 
         public static new string ice_staticId() => "::Test::TestLocatorRegistry";
@@ -1197,12 +1197,12 @@ public abstract class TestLocatorDisp_ : Ice.ObjectImpl, TestLocator
     {
         public abstract int getRequestCount(Ice.Current current);
 
-        public abstract global::Ice.LocatorRegistryPrx? getRegistry(Ice.Current current);
-
         public abstract global::System.Threading.Tasks.Task<global::Ice.ObjectPrx?> findObjectByIdAsync(global::Ice.Identity id, Ice.Current current);
 
         public abstract global::System.Threading.Tasks.Task<global::Ice.ObjectPrx?> findAdapterByIdAsync(string id, Ice.Current current);
 
+        public abstract global::Ice.LocatorRegistryPrx? getRegistry(Ice.Current current);
+
         public override string ice_id(Ice.Current current) => ice_staticId();
 
         public static new string ice_staticId() => "::Test::TestLocator";