Changeset 166 for Evidence/Evidence.cc

Timestamp:

02/09/10 08:01:07 (15 years ago)

Author:

ogrimm

Message:

Update to exception handler

File:

• Evidence/Evidence.cc (modified) (1 diff)

Evidence/Evidence.cc

@@ -199 +199 @@
         abort();
   }
-  else {
-        Terminating = true;
-
-        // Make sure there was an exception; terminate is also called for an
-        // attempt to rethrow when there is no suitable exception.
-        type_info *Type = abi::__cxa_current_exception_type();
-        if (Type != NULL) {
-          int Status = -1;
-          char *Demangled = NULL;
-
-          Demangled = abi::__cxa_demangle(Type->name(), 0, 0, &Status);
-          snprintf(Msg, sizeof(Msg), "%s: Terminate() called after throwing an instance of '%s'", ThisServer->Status->getName(), Status==0 ? Demangled : Type->name());
-          free(Demangled);
-
-          // If exception derived from std::exception, more information.
-          try { __throw_exception_again; }
-          catch (exception &E) {
-                snprintf(Msg+strlen(Msg), sizeof(Msg)-strlen(Msg), " (what(): %s)", E.what());    
-          }
-          catch (...) { }
+
+  Terminating = true;
+
+  // Make sure there was an exception; terminate is also called for an
+  // attempt to rethrow when there is no suitable exception.
+  type_info *Type = abi::__cxa_current_exception_type();
+  if (Type != NULL) {
+        int Status = -1;
+        char *Demangled = NULL;
+
+        Demangled = abi::__cxa_demangle(Type->name(), 0, 0, &Status);
+        snprintf(Msg, sizeof(Msg), "Terminate() called after throwing an instance of '%s'", Status==0 ? Demangled : Type->name());
+        free(Demangled);
+
+        // If exception derived from std::exception, more information.
+        try { __throw_exception_again; }
+        catch (exception &E) {
+          snprintf(Msg+strlen(Msg), sizeof(Msg)-strlen(Msg), " (what(): %s)", E.what());          
         }
-        else snprintf(Msg, sizeof(Msg), "%s: Terminate() called without an active exception", ThisServer->Status->getName());
-  }
+        catch (...) { }
+  }
+  else snprintf(Msg, sizeof(Msg), "Terminate() called without an active exception");
 
   ThisServer->State(FATAL, Msg);