[commit] r2312 - trunk/GME/Parser

[GMESRC Repository Notifications]

Author: ksmyth
Date: Thu Aug 29 11:18:55 2013
New Revision: 2312

Log:
MetaParser: check return value of IMgaMetaProject::Close

Modified:
   trunk/GME/Parser/MetaParser.cpp
   trunk/GME/Parser/MetaParser.h

Modified: trunk/GME/Parser/MetaParser.cpp
==============================================================================
--- trunk/GME/Parser/MetaParser.cpp	Wed Aug 28 21:30:53 2013	(r2311)
+++ trunk/GME/Parser/MetaParser.cpp	Thu Aug 29 11:18:55 2013	(r2312)
@@ -101,7 +101,9 @@
 
 		COMTHROW( metaproject->CommitTransaction() );
 
-		CloseAll();
+		HRESULT hr = CloseAll();
+		if (FAILED(hr))
+			return hr; // IErrorInfo already set by metaproject->Close()
 	}
 	catch(hresult_exception &e)
 	{
@@ -121,14 +123,19 @@
 	return S_OK;
 }
 
-void CMgaMetaParser::CloseAll()
+HRESULT CMgaMetaParser::CloseAll()
 {
+	HRESULT hr;
+
 	elements.clear();
 
-	if( metaproject != NULL )
-		metaproject->Close();
+	if (metaproject != NULL)
+		hr = metaproject->Close();
+	else
+		hr = S_OK;
 
 	metaproject = NULL;
+	return hr;
 };
 
 // ------- Attributes

Modified: trunk/GME/Parser/MetaParser.h
==============================================================================
--- trunk/GME/Parser/MetaParser.h	Wed Aug 28 21:30:53 2013	(r2311)
+++ trunk/GME/Parser/MetaParser.h	Thu Aug 29 11:18:55 2013	(r2312)
@@ -42,7 +42,7 @@
 public:
 	STDMETHOD(Parse)(BSTR filename, BSTR connection);
 	
-	void CloseAll();
+	HRESULT CloseAll();
 
 // ------- Attributes