Commit 83af72c8 authored by miller86's avatar miller86

Changing exception string for CATCHALL case to "VisItException"; fixed repoen...

Changing exception string for CATCHALL case to "VisItException"; fixed repoen failures in test suite

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@7718 18c085ea-50e0-402c-830e-de6fd14e8384
parent 619979fb
......@@ -190,7 +190,7 @@ class MISC_API VisItException
#define TRY try {
#define CATCH(T) } catch(T) { VisItException::LogCatch(#T, __FILE__, __LINE__);
#define CATCH2(T, A) } catch(T &A) { VisItException::LogCatch(#T, __FILE__, __LINE__);
#define CATCHALL } catch(...) { VisItException::LogCatch("unknown", __FILE__, __LINE__);
#define CATCHALL } catch(...) { VisItException::LogCatch("VisItException", __FILE__, __LINE__);
#define ENDTRY }
#define RETHROW throw
#define CATCH_RETURN(n) return
......@@ -303,7 +303,7 @@ int exception_default_id();
} \
else \
{ \
VisItException::LogCatch("unknown", __FILE__, __LINE__); \
VisItException::LogCatch("VisItException", __FILE__, __LINE__); \
exception_caught = true; \
......
......@@ -579,6 +579,10 @@ avtSiloFileFormat::ReadGlobalInformation(DBfile *dbfile)
// Mark C. Miller, Wed Mar 21 10:37:01 PDT 2007
// Re-factored Silo work to a static function so it can be called from
// multiple places.
//
// Mark C. Miller, Sun Jul 5 10:40:30 PDT 2009
// Added logic to rethrow an invalid files exception to match test
// suite behavior.
// ****************************************************************************
static int GetCycle(DBfile *dbfile)
......@@ -602,6 +606,11 @@ avtSiloFileFormat::GetCycle()
DBfile *dbfile = OpenFile(tocIndex, canSkipGlobalInfo);
retval = ::GetCycle(dbfile);
}
CATCH(InvalidFilesException)
{
debug1 << "Unable to GetCycle()" << endl;
RETHROW;
}
CATCHALL
{
debug1 << "Unable to GetCycle()" << endl;
......@@ -647,6 +656,10 @@ avtSiloFileFormat::GetCycleFromFilename(const char *f) const
// Mark C. Miller, Wed Mar 21 10:37:01 PDT 2007
// Re-factored Silo work to a static function so it can be called from
// multiple places.
//
// Mark C. Miller, Sun Jul 5 10:40:30 PDT 2009
// Added logic to rethrow an invalid files exception to match test
// suite behavior.
// ****************************************************************************
static double GetTime(DBfile *dbfile)
......@@ -675,6 +688,11 @@ double avtSiloFileFormat::GetTime()
DBfile *dbfile = OpenFile(tocIndex, canSkipGlobalInfo);
retval = ::GetTime(dbfile);
}
CATCH(InvalidFilesException)
{
debug1 << "Unable to GetTime()" << endl;
RETHROW;
}
CATCHALL
{
debug1 << "Unable to GetTime()" << endl;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment