Skip to content

Commit

Permalink
HEAD:(zeroc-ice/ice@7640183533) Refactor local exceptions in Swift (z…
Browse files Browse the repository at this point in the history 
…eroc-ice/ice#2378)
  • Loading branch information
@bernardnormier
bernardnormier authored and temp committed Jul 3, 2024
1 parent 0339342 commit 30567fa
Show file tree
Hide file tree
Showing 1,588 changed files with 2,736 additions and 2,736 deletions.
8 changes: 4 additions & 4 deletions slice2cpp/cpp/src/IceGrid/Internal.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1708,11 +1708,11 @@ IceGrid::InternalRegistryPrx::_iceI_registerNode(const ::std::shared_ptr<::IceIn
{
ex.ice_throw();
}
catch(const PermissionDeniedException&)
catch(const NodeActiveException&)
{
throw;
}
catch(const NodeActiveException&)
catch(const PermissionDeniedException&)
{
throw;
}
Expand Down Expand Up @@ -1758,11 +1758,11 @@ IceGrid::InternalRegistryPrx::_iceI_registerReplica(const ::std::shared_ptr<::Ic
{
ex.ice_throw();
}
catch(const PermissionDeniedException&)
catch(const ReplicaActiveException&)
{
throw;
}
catch(const ReplicaActiveException&)
catch(const PermissionDeniedException&)
{
throw;
}
Expand Down
4 changes: 2 additions & 2 deletions slice2cpp/cpp/test/Ice/exceptions/Test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,11 +221,11 @@ Test::ThrowerPrx::_iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::O
{
ex.ice_throw();
}
catch(const D&)
catch(const A&)
{
throw;
}
catch(const A&)
catch(const D&)
{
throw;
}
Expand Down
114 changes: 57 additions & 57 deletions slice2cpp/slice/IceGrid/Admin.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,15 +129,15 @@ IceGrid::AdminPrx::_iceI_syncApplication(const ::std::shared_ptr<::IceInternal::
{
ex.ice_throw();
}
catch(const ApplicationNotExistException&)
catch(const DeploymentException&)
{
throw;
}
catch(const DeploymentException&)
catch(const AccessDeniedException&)
{
throw;
}
catch(const AccessDeniedException&)
catch(const ApplicationNotExistException&)
{
throw;
}
Expand Down Expand Up @@ -183,15 +183,15 @@ IceGrid::AdminPrx::_iceI_updateApplication(const ::std::shared_ptr<::IceInternal
{
ex.ice_throw();
}
catch(const ApplicationNotExistException&)
catch(const DeploymentException&)
{
throw;
}
catch(const DeploymentException&)
catch(const AccessDeniedException&)
{
throw;
}
catch(const AccessDeniedException&)
catch(const ApplicationNotExistException&)
{
throw;
}
Expand Down Expand Up @@ -237,15 +237,15 @@ IceGrid::AdminPrx::_iceI_syncApplicationWithoutRestart(const ::std::shared_ptr<:
{
ex.ice_throw();
}
catch(const ApplicationNotExistException&)
catch(const DeploymentException&)
{
throw;
}
catch(const DeploymentException&)
catch(const AccessDeniedException&)
{
throw;
}
catch(const AccessDeniedException&)
catch(const ApplicationNotExistException&)
{
throw;
}
Expand Down Expand Up @@ -291,15 +291,15 @@ IceGrid::AdminPrx::_iceI_updateApplicationWithoutRestart(const ::std::shared_ptr
{
ex.ice_throw();
}
catch(const ApplicationNotExistException&)
catch(const DeploymentException&)
{
throw;
}
catch(const DeploymentException&)
catch(const AccessDeniedException&)
{
throw;
}
catch(const AccessDeniedException&)
catch(const ApplicationNotExistException&)
{
throw;
}
Expand Down Expand Up @@ -344,15 +344,15 @@ IceGrid::AdminPrx::_iceI_removeApplication(const ::std::shared_ptr<::IceInternal
{
ex.ice_throw();
}
catch(const ApplicationNotExistException&)
catch(const DeploymentException&)
{
throw;
}
catch(const DeploymentException&)
catch(const AccessDeniedException&)
{
throw;
}
catch(const AccessDeniedException&)
catch(const ApplicationNotExistException&)
{
throw;
}
Expand Down Expand Up @@ -397,15 +397,15 @@ IceGrid::AdminPrx::_iceI_instantiateServer(const ::std::shared_ptr<::IceInternal
{
ex.ice_throw();
}
catch(const ApplicationNotExistException&)
catch(const DeploymentException&)
{
throw;
}
catch(const DeploymentException&)
catch(const AccessDeniedException&)
{
throw;
}
catch(const AccessDeniedException&)
catch(const ApplicationNotExistException&)
{
throw;
}
Expand Down Expand Up @@ -632,15 +632,15 @@ IceGrid::AdminPrx::_iceI_getServerState(const ::std::shared_ptr<::IceInternal::O
{
ex.ice_throw();
}
catch(const ServerNotExistException&)
catch(const DeploymentException&)
{
throw;
}
catch(const DeploymentException&)
catch(const NodeUnreachableException&)
{
throw;
}
catch(const NodeUnreachableException&)
catch(const ServerNotExistException&)
{
throw;
}
Expand Down Expand Up @@ -685,15 +685,15 @@ IceGrid::AdminPrx::_iceI_getServerPid(const ::std::shared_ptr<::IceInternal::Out
{
ex.ice_throw();
}
catch(const ServerNotExistException&)
catch(const DeploymentException&)
{
throw;
}
catch(const DeploymentException&)
catch(const NodeUnreachableException&)
{
throw;
}
catch(const NodeUnreachableException&)
catch(const ServerNotExistException&)
{
throw;
}
Expand Down Expand Up @@ -767,15 +767,15 @@ IceGrid::AdminPrx::_iceI_getServerAdmin(const ::std::shared_ptr<::IceInternal::O
{
ex.ice_throw();
}
catch(const ServerNotExistException&)
catch(const DeploymentException&)
{
throw;
}
catch(const DeploymentException&)
catch(const NodeUnreachableException&)
{
throw;
}
catch(const NodeUnreachableException&)
catch(const ServerNotExistException&)
{
throw;
}
Expand Down Expand Up @@ -820,15 +820,15 @@ IceGrid::AdminPrx::_iceI_enableServer(const ::std::shared_ptr<::IceInternal::Out
{
ex.ice_throw();
}
catch(const ServerNotExistException&)
catch(const DeploymentException&)
{
throw;
}
catch(const DeploymentException&)
catch(const NodeUnreachableException&)
{
throw;
}
catch(const NodeUnreachableException&)
catch(const ServerNotExistException&)
{
throw;
}
Expand Down Expand Up @@ -873,15 +873,15 @@ IceGrid::AdminPrx::_iceI_isServerEnabled(const ::std::shared_ptr<::IceInternal::
{
ex.ice_throw();
}
catch(const ServerNotExistException&)
catch(const DeploymentException&)
{
throw;
}
catch(const DeploymentException&)
catch(const NodeUnreachableException&)
{
throw;
}
catch(const NodeUnreachableException&)
catch(const ServerNotExistException&)
{
throw;
}
Expand Down Expand Up @@ -926,19 +926,19 @@ IceGrid::AdminPrx::_iceI_startServer(const ::std::shared_ptr<::IceInternal::Outg
{
ex.ice_throw();
}
catch(const ServerNotExistException&)
catch(const DeploymentException&)
{
throw;
}
catch(const ServerStartException&)
catch(const NodeUnreachableException&)
{
throw;
}
catch(const DeploymentException&)
catch(const ServerNotExistException&)
{
throw;
}
catch(const NodeUnreachableException&)
catch(const ServerStartException&)
{
throw;
}
Expand Down Expand Up @@ -983,19 +983,19 @@ IceGrid::AdminPrx::_iceI_stopServer(const ::std::shared_ptr<::IceInternal::Outgo
{
ex.ice_throw();
}
catch(const ServerNotExistException&)
catch(const DeploymentException&)
{
throw;
}
catch(const ServerStopException&)
catch(const NodeUnreachableException&)
{
throw;
}
catch(const DeploymentException&)
catch(const ServerNotExistException&)
{
throw;
}
catch(const NodeUnreachableException&)
catch(const ServerStopException&)
{
throw;
}
Expand Down Expand Up @@ -1040,10 +1040,6 @@ IceGrid::AdminPrx::_iceI_sendSignal(const ::std::shared_ptr<::IceInternal::Outgo
{
ex.ice_throw();
}
catch(const ServerNotExistException&)
{
throw;
}
catch(const DeploymentException&)
{
throw;
Expand All @@ -1056,6 +1052,10 @@ IceGrid::AdminPrx::_iceI_sendSignal(const ::std::shared_ptr<::IceInternal::Outgo
{
throw;
}
catch(const ServerNotExistException&)
{
throw;
}
catch(const ::Ice::UserException&)
{
}
Expand Down Expand Up @@ -3213,10 +3213,6 @@ IceGrid::AdminSessionPrx::_iceI_openServerLog(const ::std::shared_ptr<::IceInter
{
ex.ice_throw();
}
catch(const ServerNotExistException&)
{
throw;
}
catch(const DeploymentException&)
{
throw;
Expand All @@ -3229,6 +3225,10 @@ IceGrid::AdminSessionPrx::_iceI_openServerLog(const ::std::shared_ptr<::IceInter
{
throw;
}
catch(const ServerNotExistException&)
{
throw;
}
catch(const ::Ice::UserException&)
{
}
Expand Down Expand Up @@ -3270,10 +3270,6 @@ IceGrid::AdminSessionPrx::_iceI_openServerStdErr(const ::std::shared_ptr<::IceIn
{
ex.ice_throw();
}
catch(const ServerNotExistException&)
{
throw;
}
catch(const DeploymentException&)
{
throw;
Expand All @@ -3286,6 +3282,10 @@ IceGrid::AdminSessionPrx::_iceI_openServerStdErr(const ::std::shared_ptr<::IceIn
{
throw;
}
catch(const ServerNotExistException&)
{
throw;
}
catch(const ::Ice::UserException&)
{
}
Expand Down Expand Up @@ -3327,10 +3327,6 @@ IceGrid::AdminSessionPrx::_iceI_openServerStdOut(const ::std::shared_ptr<::IceIn
{
ex.ice_throw();
}
catch(const ServerNotExistException&)
{
throw;
}
catch(const DeploymentException&)
{
throw;
Expand All @@ -3343,6 +3339,10 @@ IceGrid::AdminSessionPrx::_iceI_openServerStdOut(const ::std::shared_ptr<::IceIn
{
throw;
}
catch(const ServerNotExistException&)
{
throw;
}
catch(const ::Ice::UserException&)
{
}
Expand Down
Loading

0 comments on commit 30567fa

Please sign in to comment.