[GME-commit] GMESRC/GME/XmlBackEnd CoreXmlFile.cpp,1.15,1.16

[gme-commit at list.isis.vanderbilt.edu]

Update of /project/gme-repository/GMESRC/GME/XmlBackEnd
In directory escher:/tmp/cvs-serv31413

Modified Files:
	CoreXmlFile.cpp 
Log Message:
getSSCheckoutUser() might throw and in a middle of a transaction mess up things.
Caugth from now on.


CVS User: Zoltan Molnar, ISIS (zolmol)

Index: CoreXmlFile.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/XmlBackEnd/CoreXmlFile.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** CoreXmlFile.cpp	8 Jun 2007 13:33:58 -0000	1.15
--- CoreXmlFile.cpp	8 Jun 2007 13:47:11 -0000	1.16
***************
*** 2664,2668 ****
      getSourceSafePath( obj, fullPath );
      CComBSTR fullPath2 = fullPath.c_str();
! 
      CComObjPtr<IVSSItem> item;
      COMTHROW( m_vssDatabase->get_VSSItem( fullPath2, false, &(item.p)) );
--- 2664,2669 ----
      getSourceSafePath( obj, fullPath );
      CComBSTR fullPath2 = fullPath.c_str();
!   try { // by zolmol
!     // get_VSSItem() may fail in case a new element has been created recently
      CComObjPtr<IVSSItem> item;
      COMTHROW( m_vssDatabase->get_VSSItem( fullPath2, false, &(item.p)) );
***************
*** 2694,2697 ****
--- 2695,2703 ----
          user = "";
      }
+   } catch(hresult_exception&) { // by zolmol
+     // new element not yet saved 
+     //ATLASSERT(( "New element not yet saved, thus not found in VSS", 0));
+     user = ""; // as if not checked out
+   }
  }
      
***************
*** 3045,3048 ****
--- 3051,3055 ----
                  dlg.m_fileList.push_back( buf );
              }
+             else dlg.m_fileList.push_back( "A file not yet found in VSS"); // by zolmol
          }
          dlg.DoModal();