[Mobies-commit] [commit] r3821 - UDM/trunk/src/UIntWizVS/Templates/1033

[ksmyth at redhat1.isis.vanderbilt.edu]

Author: ksmyth
Date: Thu Aug  4 13:07:06 2011
New Revision: 3821

Log:
Dont leak Console refs. Dont return "Catastrophic" error

Modified:
   UDM/trunk/src/UIntWizVS/Templates/1033/RawComponent.cpp

Modified: UDM/trunk/src/UIntWizVS/Templates/1033/RawComponent.cpp
==============================================================================
--- UDM/trunk/src/UIntWizVS/Templates/1033/RawComponent.cpp	Thu Aug  4 13:07:05 2011	(r3820)
+++ UDM/trunk/src/UIntWizVS/Templates/1033/RawComponent.cpp	Thu Aug  4 13:07:06 2011	(r3821)
@@ -257,13 +257,24 @@
 		}
 	  }
 	}
+	catch (udm_exception& e)
+	{
+		ccpProject->AbortTransaction();
+		GMEConsole::Console::gmeoleapp = 0;
+		std::string msg = "Udm exception: ";
+		msg += e.what();
+		AfxMessageBox(msg.c_str());
+		return E_FAIL;
+	}
 	catch(...)
 	{
 		ccpProject->AbortTransaction();
+		GMEConsole::Console::gmeoleapp = 0;
 		// This can be a problem with the GME Console, so we display it in a message box
 		AfxMessageBox("An unexpected error has occurred during the interpretation process.");
-		return E_UNEXPECTED;
+		return E_FAIL;
 	}
+	GMEConsole::Console::gmeoleapp = 0;
 	return S_OK;
 
 }