abort on Standard_Failure::Caught: failure is sometimes null. Deprecated, use standar...

diff --git a/src/HYDROGUI/HYDROGUI_CalculationOp.cxx b/src/HYDROGUI/HYDROGUI_CalculationOp.cxx
index 3a69f8c344b432e87447576725f4c5ab2370a008..ebf31719c252b92dacd9609354d82070f6d438d3 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_CalculationOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_CalculationOp.cxx
@@ -825,10 +825,9 @@ void HYDROGUI_CalculationOp::onApply()
   {
     aResult = processApply( anUpdateFlags, anErrorMsg, aBrowseObjectsEntries );
   }
-  catch ( Standard_Failure )
+  catch ( Standard_Failure& e )
   {
-    Handle(Standard_Failure) aFailure = Standard_Failure::Caught();
-    anErrorMsg = aFailure->GetMessageString();
+    anErrorMsg = e.GetMessageString();
     aResult = false;
   }
   catch ( ... )

diff --git a/src/HYDROGUI/HYDROGUI_ExportCalculationOp.cxx b/src/HYDROGUI/HYDROGUI_ExportCalculationOp.cxx
index b024f3b5e30460526c236e0e4b6b26ab4620d7b4..94a7cb481613a81e36e77d4b07f2812ea8fde7c3 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_ExportCalculationOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_ExportCalculationOp.cxx
@@ -111,10 +111,9 @@ void HYDROGUI_ExportCalculationOp::onApply()
   try {
     aResult = processApply( anUpdateFlags, anErrorMsg, aBrowseObjectsEntries );
   }
-  catch ( Standard_Failure )
+  catch ( Standard_Failure& e )
   {
-    Handle(Standard_Failure) aFailure = Standard_Failure::Caught();
-    anErrorMsg = aFailure->GetMessageString();
+    anErrorMsg = e.GetMessageString();
     aResult = false;
   }
   catch ( ... )

diff --git a/src/HYDROGUI/HYDROGUI_Operation.cxx b/src/HYDROGUI/HYDROGUI_Operation.cxx
index f95f891f9d1fb1661052f855ebcf4eacbeda24b5..2cecdcdea3e14ba129d4f7894754a26771a84b02 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_Operation.cxx
+++ b/src/HYDROGUI/HYDROGUI_Operation.cxx
@@ -250,11 +250,10 @@ void HYDROGUI_Operation::apply()
   {
     aResult = processApply( anUpdateFlags, anErrorMsg, aBrowseObjectsEntries );
   }
-  catch ( Standard_Failure )
+  catch ( Standard_Failure& e )
   {
-    Handle(Standard_Failure) aFailure = Standard_Failure::Caught();
-    if (aFailure)
-      anErrorMsg = aFailure->GetMessageString();
+    if (&e)
+      anErrorMsg = e.GetMessageString();
     else
       anErrorMsg = "failure unknown: catch ( Standard_Failure ) does not give access to failure!";
     aResult = false;

diff --git a/src/HYDROGUI/HYDROGUI_StreamOp.cxx b/src/HYDROGUI/HYDROGUI_StreamOp.cxx
index 14db0d12a1695cfa4fdadfb095c37e331b9e9bee..89a5186da319eb50a994452bd0b84fb1adce9984 100755 (executable)
--- a/src/HYDROGUI/HYDROGUI_StreamOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_StreamOp.cxx
@@ -243,10 +243,9 @@ void HYDROGUI_StreamOp::apply()
   {
     aResult = processApply( anUpdateFlags, anErrorMsg, aBrowseObjectsEntries );
   }
-  catch ( Standard_Failure )
+  catch ( Standard_Failure& e )
   {
-    Handle(Standard_Failure) aFailure = Standard_Failure::Caught();
-    anErrorMsg = aFailure->GetMessageString();
+    anErrorMsg = e.GetMessageString();
     aResult = false;
   }
   catch ( ... )