You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by ca...@apache.org on 2005/06/21 21:01:33 UTC
svn commit: r191706 -
/xerces/c/branches/xerces-2.7/src/xercesc/framework/psvi/XSValue.cpp
Author: cargilld
Date: Tue Jun 21 12:01:32 2005
New Revision: 191706
URL: http://svn.apache.org/viewcvs?rev=191706&view=rev
Log:
Add back changes Bertoni made that were overwritten.
Modified:
xerces/c/branches/xerces-2.7/src/xercesc/framework/psvi/XSValue.cpp
Modified: xerces/c/branches/xerces-2.7/src/xercesc/framework/psvi/XSValue.cpp
URL: http://svn.apache.org/viewcvs/xerces/c/branches/xerces-2.7/src/xercesc/framework/psvi/XSValue.cpp?rev=191706&r1=191705&r2=191706&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/framework/psvi/XSValue.cpp (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/framework/psvi/XSValue.cpp Tue Jun 21 12:01:32 2005
@@ -122,6 +122,7 @@
#include <xercesc/validators/schema/SchemaSymbols.hpp>
#include <xercesc/util/OutOfMemoryException.hpp>
#include <xercesc/util/TransService.hpp>
+#include <xercesc/util/NumberFormatException.hpp>
XERCES_CPP_NAMESPACE_BEGIN
@@ -699,7 +700,7 @@
{
throw;
}
- catch (...)
+ catch (const NumberFormatException&)
{
//getActValue()/getCanonical() need to know the failure details
//if validation is required
@@ -756,7 +757,7 @@
return true; //parsing succeed
}
- catch (SchemaDateTimeException &e)
+ catch (const SchemaDateTimeException &e)
{
status = checkTimeZoneError(datatype, e)? XSValue::st_FODT0003 : st_FOCA0002;
return false;
@@ -765,7 +766,7 @@
{
throw;
}
- catch (...)
+ catch (const NumberFormatException&)
{
//getActValue()/getCanonical() need to know the failure details
//if validation is required
@@ -1067,11 +1068,6 @@
{
throw;
}
- catch (...)
- {
- isValid = false;
- status = st_FOCA0002;
- }
if (isValid == false && status == st_Init) {
status = st_FOCA0002;
@@ -1090,8 +1086,8 @@
try
{
- // All getCanonicalRepresentation does lexcial space validation only
- // (no range checking), therefore if validation is requied,
+ // getCanonicalRepresentation does lexical space validation only
+ // (no range checking), therefore if validation is required,
// we need to pass the content to the validate interface for complete checking
if (toValidate && !validateNumerics(content, datatype, status, manager))
return 0;
@@ -1131,7 +1127,7 @@
{
throw;
}
- catch (...)
+ catch (const NumberFormatException&)
{
status = st_FOCA0002;
return 0;
@@ -1193,7 +1189,7 @@
{
throw;
}
- catch (...)
+ catch (const NumberFormatException&)
{
status = st_FOCA0002;
return 0;
@@ -1290,11 +1286,7 @@
{
throw;
}
- catch (...)
- {
- status = st_FOCA0002;
- return 0;
- }
+
return 0;
}
@@ -1477,7 +1469,7 @@
{
throw;
}
- catch (...)
+ catch (const NumberFormatException&)
{
status = st_FOCA0002;
return 0;
@@ -1566,7 +1558,7 @@
{
throw;
}
- catch (...)
+ catch (const NumberFormatException&)
{
status = st_FOCA0002;
return 0;
@@ -1681,11 +1673,7 @@
{
throw;
}
- catch (...)
- {
- status = st_FOCA0002;
- return 0;
- }
+
return 0;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org