Author: cargilld
Date: Wed Jul 27 07:02:33 2005
New Revision: 225517

URL: http://svn.apache.org/viewcvs?rev=225517&view=rev
Log:
Update loadAMsgSet routines to have consisent behaviour.

Modified:
    xerces/c/trunk/src/xercesc/util/Platforms/OS2/OS2PlatformUtils.cpp

Modified: xerces/c/trunk/src/xercesc/util/Platforms/OS2/OS2PlatformUtils.cpp
URL: 
http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/util/Platforms/OS2/OS2PlatformUtils.cpp?rev=225517&r1=225516&r2=225517&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/Platforms/OS2/OS2PlatformUtils.cpp 
(original)
+++ xerces/c/trunk/src/xercesc/util/Platforms/OS2/OS2PlatformUtils.cpp Wed Jul 
27 07:02:33 2005
@@ -36,6 +36,7 @@
 #include    <xercesc/util/XMLString.hpp>
 #include    <xercesc/util/XMLUniDefs.hpp>
 #include    <xercesc/util/PanicHandler.hpp>
+#include    <xercesc/util/OutOfMemoryException.hpp>
 
 #include    <stdio.h>
 #include    <stdlib.h>
@@ -377,11 +378,25 @@
 // -----------------------------------------------------------------------
 XMLMsgLoader* XMLPlatformUtils::loadAMsgSet(const XMLCh* const msgDomain)
 {
+    XMLMsgLoader* retVal;
+    try
+    {
 #if defined(XML_USE_INMEMORY_MSGLOADER)
-    return new (fgMemoryManager) InMemMsgLoader(msgDomain);
+        retVal = new (fgMemoryManager) InMemMsgLoader(msgDomain);
 #else
-    return 0;
+        #error You must provide a message loader
+        return 0;
 #endif
+    }
+    catch(const OutOfMemoryException&)
+    {
+        throw;
+    }
+    catch(...)
+    {
+         panic(PanicHandler::Panic_CantLoadMsgDomain);
+    }
+    return retVal;
 }
 
 XMLNetAccessor* XMLPlatformUtils::makeNetAccessor()



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to