Author: cargilld
Date: Wed Jul 27 07:03:11 2005
New Revision: 225520
URL: http://svn.apache.org/viewcvs?rev=225520&view=rev
Log:
Update loadAMsgSet routines to have consisent behaviour.
Modified:
xerces/c/trunk/src/xercesc/util/Platforms/Win32/Win32PlatformUtils.cpp
Modified: xerces/c/trunk/src/xercesc/util/Platforms/Win32/Win32PlatformUtils.cpp
URL:
http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/util/Platforms/Win32/Win32PlatformUtils.cpp?rev=225520&r1=225519&r2=225520&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/Platforms/Win32/Win32PlatformUtils.cpp
(original)
+++ xerces/c/trunk/src/xercesc/util/Platforms/Win32/Win32PlatformUtils.cpp Wed
Jul 27 07:03:11 2005
@@ -31,6 +31,7 @@
#include <xercesc/util/XMLUniDefs.hpp>
#include <xercesc/util/XMLUni.hpp>
#include <xercesc/util/PanicHandler.hpp>
+#include <xercesc/util/OutOfMemoryException.hpp>
#include <windows.h>
#include <stdio.h>
@@ -769,15 +770,29 @@
//
XMLMsgLoader* XMLPlatformUtils::loadAMsgSet(const XMLCh* const msgDomain)
{
+ XMLMsgLoader* retVal;
+ try
+ {
#if defined (XML_USE_INMEM_MESSAGELOADER)
- return new (fgMemoryManager) InMemMsgLoader(msgDomain);
+ retVal = new (fgMemoryManager) InMemMsgLoader(msgDomain);
#elif defined (XML_USE_WIN32_MSGLOADER)
- return new (fgMemoryManager) Win32MsgLoader(msgDomain);
+ retVal = new (fgMemoryManager) Win32MsgLoader(msgDomain);
#elif defined (XML_USE_ICU_MESSAGELOADER)
- return new (fgMemoryManager) ICUMsgLoader(msgDomain);
+ retVal = new (fgMemoryManager) ICUMsgLoader(msgDomain);
#else
- #error You must provide a message loader
+ #error You must provide a message loader
+ return 0;
#endif
+ }
+ catch(const OutOfMemoryException&)
+ {
+ throw;
+ }
+ catch(...)
+ {
+ panic(PanicHandler::Panic_CantLoadMsgDomain);
+ }
+ return retVal;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
