HEAD:(zeroc-ice/ice@d8f75751cc) Additional cleanup for Python extensi…

…on (zeroc-ice/ice#2455)
InsertCreativityHere · Jul 11, 2024 · b78851e · b78851e
1 parent eaaa44f
commit b78851e
Show file tree

Hide file tree

Showing 1,569 changed files with 2,295 additions and 2,775 deletions.
diff --git a/slice2cpp/cpp/src/IceGrid/Internal.cpp b/slice2cpp/cpp/src/IceGrid/Internal.cpp
@@ -1708,11 +1708,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;
             }
@@ -1758,11 +1758,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;
             }

diff --git a/slice2cpp/csharp/test/Ice/exceptions/Test.cpp b/slice2cpp/csharp/test/Ice/exceptions/Test.cpp
@@ -218,11 +218,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;
             }

diff --git a/slice2cpp/java/test/src/main/java/test/Ice/exceptions/Test.cpp b/slice2cpp/java/test/src/main/java/test/Ice/exceptions/Test.cpp
@@ -218,11 +218,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;
             }