Changeset 7174 for code/trunk/src/libraries

Timestamp:

Aug 18, 2010, 12:08:05 AM (14 years ago)

Author:

rgrieder

Message:

Only catch exceptions you actually expect. And rethrow unknown exceptions ("…" can also catch internal Microsoft exceptions like floating point exception).

Location:

code/trunk/src/libraries

Files:

• core/IRC.cc (modified) (2 diffs)
• core/TclBind.cc (modified) (4 diffs)
• core/TclThreadManager.cc (modified) (1 diff)
• core/input/InputDevice.h (modified) (2 diffs)
• core/input/InputManager.cc (modified) (2 diffs)
• tools/ResourceLocation.cc (modified) (1 diff)
• util/Exception.cc (modified) (2 diffs)

code/trunk/src/libraries/core/IRC.cc

@@ -66 +66 @@
         catch (Tcl::tcl_error const &e)
         {   COUT(1) << "Tcl (IRC) error: " << e.what();   }
-        catch (...)
-        {   COUT(1) << "Error while initializing Tcl (IRC): " << Exception::handleMessage();   }
 
         this->nickname_ = "orx" + multi_cast<std::string>(static_cast<unsigned int>(rand()));
@@ -96 +94 @@
         catch (Tcl::tcl_error const &e)
         {   COUT(1) << "Tcl (IRC) error: " << e.what();   }
-        catch (...)
-        {   COUT(1) << "Error while executing Tcl (IRC): " << Exception::handleMessage();   }
 
         return false;

code/trunk/src/libraries/core/TclBind.cc

@@ -93 +93 @@
             catch (Tcl::tcl_error const &e)
             {   COUT(1) << "Tcl error while creating Tcl-interpreter: " << e.what() << std::endl;   }
-            catch (...)
-            {   COUT(1) << "Error while creating Tcl-interpreter: " << Exception::handleMessage() << std::endl;   }
         }
     }
@@ -114 +112 @@
         catch (Tcl::tcl_error const &e)
         {   COUT(1) << "Tcl error while creating Tcl-interpreter: " << e.what() << std::endl; COUT(1) << "Error: Tcl isn't properly initialized. Orxonox might possibly not work like that." << std::endl;   }
-        catch (...)
-        {   COUT(1) << "Error while creating Tcl-interpreter: " << Exception::handleMessage() << std::endl; COUT(1) << "Error: Tcl isn't properly initialized. Orxonox might possibly not work like that." << std::endl;   }
 
         return interpreter;
@@ -175 +171 @@
             catch (Tcl::tcl_error const &e)
             {   COUT(1) << "tcl> Error: " << e.what() << std::endl;   }
-            catch (...)
-            {   COUT(1) << "Error while executing Tcl: " << Exception::handleMessage() << std::endl;   }
         }
 
@@ -196 +190 @@
         catch (Tcl::tcl_error const &e)
         {   COUT(1) << "Tcl error: " << e.what() << std::endl;   }
-        catch (...)
-        {   COUT(1) << "Error while executing Tcl: " << Exception::handleMessage() << std::endl;   }
 
         return false;

code/trunk/src/libraries/core/TclThreadManager.cc

@@ -287 +287 @@
         catch (const Tcl::tcl_error& e)
         {   bundle->interpreter_ = 0; COUT(1) << "Tcl error while creating Tcl-interpreter (" << id_string << "): " << e.what() << std::endl;   }
-        catch (...)
-        {   bundle->interpreter_ = 0; COUT(1) << "Error while creating Tcl-interpreter (" << id_string << "): " << Exception::handleMessage() << std::endl;   }
     }
 

code/trunk/src/libraries/core/input/InputDevice.h

@@ -40 +40 @@
 #include <vector>
 #include <ois/OISInputManager.h>
+#include <ois/OISException.h>
 
 #include "util/Clock.h"
@@ -144 +145 @@
                 oisInputManager_->destroyInputObject(oisDevice_);
             }
-            catch (...)
+            catch (const OIS::Exception& ex)
             {
-                COUT(1) << this->getClassName() << " destruction failed: " << Exception::handleMessage() << std::endl
+                COUT(1) << this->getClassName() << " destruction failed: " << ex.eText << std::endl
                         << "    Potential resource leak!" << std::endl;
             }

code/trunk/src/libraries/core/input/InputManager.cc

@@ -306 +306 @@
                 continue;
             const std::string& className = device->getClassName();
-            try
-            {
-                delete device;
-                device = 0;
-                CCOUT(4) << className << " destroyed." << std::endl;
-            }
-            catch (...)
-            {
-                COUT(1) << className << " destruction failed: " << Exception::handleMessage() << std::endl
-                        << "    Potential resource leak!" << std::endl;
-            }
+            delete device;
+            device = 0;
+            CCOUT(4) << className << " destroyed." << std::endl;
         }
         devices_.resize(InputDeviceEnumerator::FirstJoyStick);
@@ -325 +317 @@
             OIS::InputManager::destroyInputSystem(oisInputManager_);
         }
-        catch (...)
-        {
-            COUT(1) << "OIS::InputManager destruction failed" << Exception::handleMessage() << std::endl
+        catch (const OIS::Exception& ex)
+        {
+            COUT(1) << "OIS::InputManager destruction failed" << ex.eText << std::endl
                     << "    Potential resource leak!" << std::endl;
         }

code/trunk/src/libraries/tools/ResourceLocation.cc

@@ -98 +98 @@
                 this->getPath(), this->getResourceGroup());
         }
-        catch (...)
+        catch (const Ogre::Exception& ex)
         {
-            COUT(1) << "Removing of a ResourceLocation failed: " << Exception::handleMessage() << std::endl;
+            COUT(1) << "Removing of a ResourceLocation failed: " << ex.what() << std::endl;
         }
     }

code/trunk/src/libraries/util/Exception.cc

@@ -34 +34 @@
 
 #include "Exception.h"
+
 #include <CEGUIExceptions.h>
+#include "Debug.h"
 
 namespace orxonox
@@ -115 +117 @@
         catch (...)
         {
-            return "Unknown exception";
+            COUT(0) << "BIG WARNING: Unknown exception type encountered."
+                    << "Rethrowing" << endl;
+            throw;
         }
     }